Merge remote-tracking branch 'gitorious-shapado/new-ui-login' into new-ui
authorJohanna Mantilla Duque <johanna1431@gmail.com>
Mon, 20 Feb 2012 02:54:41 +0000 (21:54 -0500)
committerJohanna Mantilla Duque <johanna1431@gmail.com>
Mon, 20 Feb 2012 02:54:41 +0000 (21:54 -0500)
commit2709ae0dd64b5142e923e0377b1792fa750550b5
treed52fe8483d9ad782dcdb8c66ff240f9231e54d62
parent860338b597f79712849cc2db4c434d9a4d10f089
parent6e1d2f8f0bd805f72f8104c8a83af2433838f127
Merge remote-tracking branch 'gitorious-shapado/new-ui-login' into new-ui