Merge branch 'master' into lgpl
authorEmmanuel Garette <egarette@cadoles.com>
Sun, 22 Sep 2013 20:01:19 +0000 (22:01 +0200)
committerEmmanuel Garette <egarette@cadoles.com>
Sun, 22 Sep 2013 20:01:19 +0000 (22:01 +0200)
commit4a44068a23bb0e8ee0ad8a43b2173ef450652939
tree1b621b131eb7b9047b34a6b1f86ec1216928ee75
parent4d6d8bf20113d22926b2bd740d14e48d6906481c
parentd2f101b7bbd99375c1c85e2ff32a3c067bea1e67
Merge branch 'master' into lgpl

Conflicts:
setup.py
doc/index.txt
setup.py