Merge branch 'trunk' of https://github.com/Mechtilde/gitmagic
commita71238b4ae648063aa177f2b8b713bebcdc93bd0
authorBen Lynn <benlynn@gmail.com>
Sat, 10 Jan 2015 10:08:03 +0000 (10 02:08 -0800)
committerBen Lynn <benlynn@gmail.com>
Sat, 10 Jan 2015 10:08:03 +0000 (10 02:08 -0800)
tree4e764932dca9644661d82c5c631e26da8da26750
parentc1636d8c5f416df10ab3664ae458148d7497c399
parentd0afd83f80675872332c3fdad59384a720e9672c
Merge branch 'trunk' of https://github.com/Mechtilde/gitmagic