Merge pull request #21 from olerem/buildfixes
authorAdrian Chadd <adrian.chadd@gmail.com>
Thu, 25 Apr 2013 22:54:00 +0000 (15:54 -0700)
committerAdrian Chadd <adrian.chadd@gmail.com>
Thu, 25 Apr 2013 22:54:00 +0000 (15:54 -0700)
commit2a38076807b9fac0fe6cedcdcc213c10a8658910
tree42c6aaec9811d34fdf4d529fc23adadb24b3bb4f
parente4907d71215893b6d000f84ec989fa2839ca576a
parenta5ae540857f75501e8bbf2159a7948004c008f2d
Merge pull request #21 from olerem/buildfixes

Buildfixes, final pull