merged from repo
commit013f72a5f0b02481dea2652c0a0f908467e284ed
authorFlavio Poletti <flavio@polettix.it>
Tue, 27 Aug 2013 12:40:36 +0000 (27 14:40 +0200)
committerFlavio Poletti <flavio@polettix.it>
Tue, 27 Aug 2013 12:40:36 +0000 (27 14:40 +0200)
tree6f2895bb379cd11220511ec7f8b2ea4bf88ad6e6
parentbb51dfed2df014d35f6bc7074b5d7d6255dc4ba1
parent77e97b0c0166cc2c5d7be0698910b503ca3e242d
merged from repo