Merge branch 'next' of gitorious.org:shapado/shapado into next
authorPatrick Aljord <patcito@gmail.com>
Tue, 28 Dec 2010 05:42:08 +0000 (00:42 -0500)
committerPatrick Aljord <patcito@gmail.com>
Tue, 28 Dec 2010 05:42:08 +0000 (00:42 -0500)
commit72931aca757c6f6f5ae214b043ebeed2bdcb6a12
tree1d054fc6350e0878b723217922eb094845439a85
parentcf74b72512972af152894f8f2e561d579b8641cb
parentb4edc4186acac16d75b2724b05838026e02c9856
Merge branch 'next' of gitorious.org:shapado/shapado into next