Merge branch 'a2an' of git://github.com/derekmahar/gitmagic
commit79f13be7ade6f8ba6479c4b23982274fc0f20d4b
authorBen Lynn <benlynn@gmail.com>
Tue, 23 Dec 2008 01:06:41 +0000 (22 17:06 -0800)
committerBen Lynn <benlynn@gmail.com>
Tue, 23 Dec 2008 01:06:41 +0000 (22 17:06 -0800)
treeb452e683b1805c26f10929869004505792909e40
parent3807fbdabd03f8f2b10b6266fb76ed713268ed74
parentebe8cb16eb6cd4a6ac6a4373be48c0132cffb9ae
Merge branch 'a2an' of git://github.com/derekmahar/gitmagic