Merge branch 'master' of https://github.com/blynn/gitmagic
authorTran Ngoc Quan <vnwildman@gmail.com>
Sun, 4 Mar 2012 02:19:08 +0000 (4 09:19 +0700)
committerTran Ngoc Quan <vnwildman@gmail.com>
Sun, 4 Mar 2012 02:19:08 +0000 (4 09:19 +0700)

Trivial merge