Merge pull request #56 from TheCount/develop
authorEric Haszlakiewicz <erh+git@nimenees.com>
Sun, 23 Dec 2012 16:23:13 +0000 (08:23 -0800)
committerEric Haszlakiewicz <erh+git@nimenees.com>
Sun, 23 Dec 2012 16:23:13 +0000 (08:23 -0800)
commit86aedc2d2a1d910b8e727d018be25374f16cf64c
treed42e0d25eb9f2b35ee08a000ca48838b8b9e71a4
parent4e4af93d667ae0d3cb9779f5a3c3f964cc9d7d81
parent18abf6e5092175e7de27e73c6bb643b2bf57ec7d
Merge pull request #56 from TheCount/develop

Some houskeeping