merged.
authorPascal J. Bourguignon <pjb@informatimago.com>
Fri, 2 May 2014 10:56:16 +0000 (12:56 +0200)
committerPascal J. Bourguignon <pjb@informatimago.com>
Fri, 2 May 2014 10:56:16 +0000 (12:56 +0200)
commit081b71c58440d3ea99ac41746c6dee6cf280633e
tree726b6336ec600d61dab33195e6acc3c8af9d65f7
parent3d0145fc6e6bf4da5e207b3c499e9395dcaa81f2
parent63fb7bd2d062f8fd03f4fc3d7744f6486311f40f
merged.