Merge pull request #5 from nullsub/master
authortexane <texane@gmail.com>
Sun, 5 Jun 2011 17:14:10 +0000 (10:14 -0700)
committertexane <texane@gmail.com>
Sun, 5 Jun 2011 17:14:10 +0000 (10:14 -0700)
commit4f35b81fc5ae48cb2cff8cbbc5d1b242bc2c829e
tree374d179f7b3b2ebb802b0e7469a9138d4fffe5ed
parent24128597e1ec3fa8aa042aa80db8582d20a14bb6
parent7705e43f069a58f00fe6865026be9e0a0c7a5bab
Merge pull request #5 from nullsub/master

Compile on Ubuntu 10.10 and 11.04