Merge branch 'generic-remote'
commit77e97b0c0166cc2c5d7be0698910b503ca3e242d
authorFlavio Poletti <flavio@polettix.it>
Fri, 16 Aug 2013 15:23:30 +0000 (16 17:23 +0200)
committerFlavio Poletti <flavio@polettix.it>
Fri, 16 Aug 2013 15:23:30 +0000 (16 17:23 +0200)
tree6f2895bb379cd11220511ec7f8b2ea4bf88ad6e6
parentc347dc95de068c99a41f036810244a5061b245d5
parent7851bdc501be2c397cf90f9d5219e668b247b398
Merge branch 'generic-remote'