Merge branch 'master' of gitorious.org:shapado/shapado
authorPatrick Aljord <patcito@gmail.com>
Sat, 16 Apr 2011 20:04:05 +0000 (15:04 -0500)
committerPatrick Aljord <patcito@gmail.com>
Sat, 16 Apr 2011 20:04:05 +0000 (15:04 -0500)
commit7aad01242e0436813b33a57680c8b6b7b8ad673e
tree653950984b054796028c28631a3eef880ef09a67
parent78c1125abaee01d32c9e6d18b535abcdf582a6b9
parentb32ea96f4165eef79dcd442621cd248d456a767d
Merge branch 'master' of gitorious.org:shapado/shapado