Merge branch 'a2an' of git://github.com/derekmahar/gitmagic