Merge remote-tracking branch 'gitorious-shapado/new-ui' into new-ui
authorJohanna Mantilla Duque <johanna1431@gmail.com>
Mon, 20 Feb 2012 02:50:18 +0000 (21:50 -0500)
committerJohanna Mantilla Duque <johanna1431@gmail.com>
Mon, 20 Feb 2012 02:50:18 +0000 (21:50 -0500)
commit860338b597f79712849cc2db4c434d9a4d10f089
treeee690b2055c2e6a5424ccb4930f1ab81490b471e
parente59ffc91a1bd0ea1f97529d270c73b7649ae0b35
parent21baa50bc3719425414ebf7f314a4918a4d58b14
Merge remote-tracking branch 'gitorious-shapado/new-ui' into new-ui