Merge branch 'new-ui' of git://gitorious.org/shapado/shapado into new-ui
authorJohanna Mantilla Duque <johanna1431@gmail.com>
Sun, 5 Feb 2012 01:04:51 +0000 (20:04 -0500)
committerJohanna Mantilla Duque <johanna1431@gmail.com>
Sun, 5 Feb 2012 01:04:51 +0000 (20:04 -0500)
commita77baa0687daa217a826d34a9aaed6d4a2baf01f
tree3ee4c02da6840aa1e3245346f5e0327327101b56
parent239558d3b5c1c7da13ca92e90c7f84256cd952c2
parent5dd7241827e062b1c7cf590322c15ffe5ca85712
Merge branch 'new-ui' of git://gitorious.org/shapado/shapado into new-ui