Merge branch 'v1.1'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 29 Sep 2014 07:45:54 +0000 (09:45 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 29 Sep 2014 07:45:54 +0000 (09:45 +0200)
commitd6141b1d4fea0db9b115b06c668be6195ac4e5c6
tree8d6a01176c008ebd1bdc2850f09e47a384040d48
parent55b1c787e39cb5641c5941021fd70f6e2f62b413
parent9874462ec794c60f21737dfda4ae7aaab4fec781
Merge branch 'v1.1'

Conflicts:
NEWS
NEWS
configure.ac
src/Makefile.am