Merge branch 'master' of gitorious.org:shapado/shapado
authorPatrick Aljord <patcito@gmail.com>
Mon, 27 Sep 2010 06:22:58 +0000 (01:22 -0500)
committerPatrick Aljord <patcito@gmail.com>
Mon, 27 Sep 2010 06:22:58 +0000 (01:22 -0500)
commit7d92276dd259ba696db843d9229efea0047ba89d
treeafad571ab2e4a1806788698c3c64fd145429c53a
parent65952014af9da8b4bab457906a606d557f3a7a71
parent88b16f6c31a633a61cf79eddd164b4c2132e9855
Merge branch 'master' of gitorious.org:shapado/shapado