Merge branch 'new-ui' of git://gitorious.org/shapado/shapado into new-ui
authorJohanna Mantilla Duque <johanna1431@gmail.com>
Mon, 20 Feb 2012 01:56:51 +0000 (20:56 -0500)
committerJohanna Mantilla Duque <johanna1431@gmail.com>
Mon, 20 Feb 2012 01:56:51 +0000 (20:56 -0500)
commite59ffc91a1bd0ea1f97529d270c73b7649ae0b35
treeee690b2055c2e6a5424ccb4930f1ab81490b471e
parent1bcefbcc9ee98f6a9413d35c642dec1f9a5085b0
parentc056351d801c6411a599e9e1413a2821891860e9
Merge branch 'new-ui' of git://gitorious.org/shapado/shapado into new-ui