Merge branch 'new-ui' of gitorious.org:shapado/shapado into new-ui
authorPatrick Aljord <patcito@gmail.com>
Mon, 20 Feb 2012 01:53:19 +0000 (20:53 -0500)
committerPatrick Aljord <patcito@gmail.com>
Mon, 20 Feb 2012 01:53:19 +0000 (20:53 -0500)
commit21baa50bc3719425414ebf7f314a4918a4d58b14
tree3be96263f8cf449b11ab77b67c62697c264afdd1
parentce23583736a2ba60775133d2e2bfa5ab9ffc8dd9
parentc056351d801c6411a599e9e1413a2821891860e9
Merge branch 'new-ui' of gitorious.org:shapado/shapado into new-ui