Merge pull request #188 from saschpe/master-nose-fixup
authorSalim Fadhley <sal@stodge.org>
Wed, 23 Oct 2013 09:08:40 +0000 (02:08 -0700)
committerSalim Fadhley <sal@stodge.org>
Wed, 23 Oct 2013 09:08:40 +0000 (02:08 -0700)
Fixup commit 2b14616c6a9577b4


Trivial merge