Merge branch 'master' of gitorious.org:shapado/shapado
authorPatrick Aljord <patcito@gmail.com>
Wed, 22 Sep 2010 05:55:44 +0000 (00:55 -0500)
committerPatrick Aljord <patcito@gmail.com>
Wed, 22 Sep 2010 05:55:44 +0000 (00:55 -0500)
commitd3364e7dcfa28c17083d5bd0046ee85fe5c6b08b
tree132f37ca4bceff3f5ecd16e84046af37e355c9a3
parent724e6b89ac8f59c59a3ff3aa85c232fce8e72434
parentd959c52c81f71e24350d95e614cfa29a2e0dfbea
Merge branch 'master' of gitorious.org:shapado/shapado