Merge pull request #73 from simonlnu/master
authorSimon <simon@kisikew.org>
Sun, 4 Mar 2012 00:23:07 +0000 (16:23 -0800)
committerSimon <simon@kisikew.org>
Sun, 4 Mar 2012 00:23:07 +0000 (16:23 -0800)
dispy! (and minor formatting)


Trivial merge