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

Trivial merge