Merge branch 'master' of gitorious.org:shapado/shapado
authorPatrick Aljord <patcito@gmail.com>
Mon, 24 Jan 2011 01:06:01 +0000 (20:06 -0500)
committerPatrick Aljord <patcito@gmail.com>
Mon, 24 Jan 2011 01:06:01 +0000 (20:06 -0500)
commit86ea1f8e360d792521ccd52e3381bf5996e71d9a
tree8794b57612bc8f2705f957260f492945007f7dec
parent1b8a74f989e0b207c18e74015277c3a8e24b92a8
parentb239cdfee60cf4da6b9ca3a0ed102661bda411cc
Merge branch 'master' of gitorious.org:shapado/shapado