merged.
authorPascal J. Bourguignon <pjb@informatimago.com>
Thu, 12 Dec 2013 20:30:39 +0000 (21:30 +0100)
committerPascal J. Bourguignon <pjb@informatimago.com>
Thu, 12 Dec 2013 20:30:39 +0000 (21:30 +0100)
commitc75ead13b828b078c4382e911968722c412815ac
tree9676707b7acb49307586eebc81ddbf14205c8a3e
parent1a1e85a2e52f64278e69a96e68e6abbea55fddb7
parentad8122dc20a90939d124720ae960e3e4a6c37fee
merged.