Merge most of PR#298
commita87655480ffbfdb8c29a843c77ba23e5c00dc79a
authorColomban Wendling <ban@herbesfolles.org>
Fri, 11 Jul 2014 16:06:59 +0000 (11 18:06 +0200)
committerColomban Wendling <ban@herbesfolles.org>
Fri, 11 Jul 2014 16:06:59 +0000 (11 18:06 +0200)
tree47809a03444c3f2d08a6473e5f06e4223d6611fa
parent6768a1b78f131dc857ba7674c213a70ef19edc5d
parentffcec43d01609ea0cc8a8e25d77bd4325b5b1e27
Merge most of PR#298