Merged.
authorPascal J. Bourguignon <pjb@informatimago.com>
Sat, 5 Jan 2013 17:10:11 +0000 (18:10 +0100)
committerPascal J. Bourguignon <pjb@informatimago.com>
Sat, 5 Jan 2013 17:10:11 +0000 (18:10 +0100)
commitad1f84836f0f57892b230f755852757f022b8f1d
treeb1d4367b79d7db17182070c6d5401895ff802b5b
parenta80163b32b3cd694a265c864943941c0c9d13bcd
parent27bbd9db63a385c88fc218b2934f2ae38f14edf1
Merged.