Merge branch 'patch-1' of https://github.com/Nioub/gitmagic
authorBen Lynn <benlynn@gmail.com>
Thu, 12 Apr 2012 06:42:59 +0000 (23:42 -0700)
committerBen Lynn <benlynn@gmail.com>
Thu, 12 Apr 2012 06:42:59 +0000 (23:42 -0700)
commit0ea6a2eaadca2409c7e196f2624a861aeef459c7
tree8a9053a05b21d268bee84b6ede5b7a0dad806f69
parent50722d45721ed016da3630da9d6945eec9a7abec
parentd9ad139650d8d84f2932d8871289272230337854
Merge branch 'patch-1' of https://github.com/Nioub/gitmagic