Merge branch 'ubuntu'
authorXavier Boudet <xboudet@gmail.com>
Sat, 19 Oct 2013 15:58:53 +0000 (17:58 +0200)
committerXavier Boudet <xboudet@gmail.com>
Sat, 19 Oct 2013 15:58:53 +0000 (17:58 +0200)
commit942c11aef920f972ef73a2abd09486c42f44db44
treee702b237d30c8eaea03029c5255c7dccbd270b56
parentb997ffdf7da07289e85a76f388e686f6e877ee7f
parentdd4121c994c2da824004c1e667bc8f03e20aa387
Merge branch 'ubuntu'

Conflicts:
debian/changelog
debian/patches/series
debian/changelog
debian/patches/series