Merge remote-tracking branch 'gitorious-shapado/new-ui' into new-ui
authorJohanna Mantilla Duque <johanna1431@gmail.com>
Mon, 20 Feb 2012 03:13:25 +0000 (22:13 -0500)
committerJohanna Mantilla Duque <johanna1431@gmail.com>
Mon, 20 Feb 2012 03:13:25 +0000 (22:13 -0500)
commit91be0b518cd530fa7d3d690e253c57b40de342c0
treec443f0706b3ff4897dc07b1d2ada6638aa4b4b8b
parent2709ae0dd64b5142e923e0377b1792fa750550b5
parent4e587385f298b8fd44e1fc8ed093691f7f35d6a5
Merge remote-tracking branch 'gitorious-shapado/new-ui' into new-ui