Merge branch 'acm-hacks' of gitorious.org:opencraft-acm/opencraft-acm into acm-hacks
authorAdam Liszka <sidein@usiah.com>
Thu, 13 May 2010 03:15:09 +0000 (23:15 -0400)
committerAdam Liszka <sidein@usiah.com>
Thu, 13 May 2010 03:15:09 +0000 (23:15 -0400)
commit2baccf03d7992be47dc14aaeb130eab43456dd59
treeb1d6c3c4d1c6751ae89b5b183e963eb51e72ecb2
parentba8cbd903e23d6749f303aea6de79bb122e83c4a
parent1521937f213689549f4608aff2b654dce611dc75
Merge branch 'acm-hacks' of gitorious.org:opencraft-acm/opencraft-acm into acm-hacks