Merge pull request #1360 from MartijnKaijser/master
authorMartijn Kaijser <machine.sanctum@gmail.com>
Mon, 3 Sep 2012 12:21:24 +0000 (05:21 -0700)
committerMartijn Kaijser <machine.sanctum@gmail.com>
Mon, 3 Sep 2012 12:21:24 +0000 (05:21 -0700)
version bump September merge window


Trivial merge