Merge branch 'master' of gitorious.org:shapado/shapado
authorPatrick Aljord <patcito@gmail.com>
Fri, 5 Nov 2010 08:24:41 +0000 (03:24 -0500)
committerPatrick Aljord <patcito@gmail.com>
Fri, 5 Nov 2010 08:24:41 +0000 (03:24 -0500)
commita083e387ef4bb9b2995bbce909ad5801b2d6df8c
tree5fb4de567c0a532feab7d3a203f036fe0046a7ea
parente4e37f5cf0cfba2576ab98f4d1ebeb1ee431d565
parent52ba49ee3449a4b58075434d9b0899ebacf81d73
Merge branch 'master' of gitorious.org:shapado/shapado