Merge branch 'master' of gitorious.org:shapado/shapado
authorPatrick Aljord <patcito@gmail.com>
Thu, 23 Sep 2010 22:36:40 +0000 (17:36 -0500)
committerPatrick Aljord <patcito@gmail.com>
Thu, 23 Sep 2010 22:36:40 +0000 (17:36 -0500)
commita99bad21332582546d328f6fe4adc54ba24a66f4
treef01e338a5b07e9b120690a865e3e50b2c1ca19db
parent81c1a5b9d4b16d4174cc6a942d4dd3519dbf9968
parent650aaa907c50ff26f8734a04e891c153bfd617aa
Merge branch 'master' of gitorious.org:shapado/shapado