Code

Merge branch 'master' into sid
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 16 Oct 2015 16:20:25 +0000 (18:20 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 16 Oct 2015 16:20:25 +0000 (18:20 +0200)
commit0a61885c13fc5ef16a357eb7af15e36147d1ce38
tree5d52ff2653ccf799043dea8878f1dafc36f9db48
parentb9e86fc46a677498d06e116a9e0e5360f7647ddb
parent51272426690a725c7831672ffbad306deb897c6f
Merge branch 'master' into sid
debian/gbp.conf