Merge branch 'master' of gitorious.org:shapado/shapado
authorPatrick Aljord <patcito@gmail.com>
Wed, 18 Jul 2012 22:56:35 +0000 (23:56 +0100)
committerPatrick Aljord <patcito@gmail.com>
Wed, 18 Jul 2012 22:56:35 +0000 (23:56 +0100)
commit5a820732e8cf6270bf5ce074d685137395135369
treebb6828de49142e470af9c5323dae6f2ee472911b
parent900818da38fbaa1a323755e1faea4561ff6395a9
parent9e1bcf31ae1b4083a3b71ec21d92eadd11175e1b
Merge branch 'master' of gitorious.org:shapado/shapado