Merge branch 'master' of https://github.com/blynn/gitmagic
authorTran Ngoc Quan <vnwildman@gmail.com>
Sun, 15 Apr 2012 06:54:31 +0000 (15 13:54 +0700)
committerTran Ngoc Quan <vnwildman@gmail.com>
Sun, 15 Apr 2012 06:54:31 +0000 (15 13:54 +0700)

Trivial merge