Merged.
authorPascal J. Bourguignon <pjb@informatimago.com>
Sat, 7 Sep 2013 23:19:59 +0000 (01:19 +0200)
committerPascal J. Bourguignon <pjb@informatimago.com>
Sat, 7 Sep 2013 23:19:59 +0000 (01:19 +0200)
commit6941210a1b0c140ffa1ecf5f3e861640e8d00d45
tree9850a70633915e5b40049c5954a578942608a3bc
parent1db617ebd7ef0fc2ad37fad3594779a680e1e5b5
parente18ce18b77899c8ee892bc4b967195f653cc66a5
Merged.