merged.
authorPascal J. Bourguignon <pjb@informatimago.com>
Fri, 2 May 2014 16:45:19 +0000 (18:45 +0200)
committerPascal J. Bourguignon <pjb@informatimago.com>
Fri, 2 May 2014 16:45:19 +0000 (18:45 +0200)
commit2b229c2b45c230278e80217c908092fe76871b54
treec72d97645113be4aa375687364d8f5372d813e9a
parentcd97f41b366c8da9f908a25b8fc9b7083e87fe29
parent081b71c58440d3ea99ac41746c6dee6cf280633e
merged.