Merged.
authorPascal J. Bourguignon <pjb@informatimago.com>
Sat, 22 Jun 2013 10:25:10 +0000 (12:25 +0200)
committerPascal J. Bourguignon <pjb@informatimago.com>
Sat, 22 Jun 2013 10:25:10 +0000 (12:25 +0200)
commitf259b5c3b0afe574963a70d6616c9715e193d792
tree368c1475f2fc3a8053d7e09ded714b90e315a7aa
parent377ded224a154c91ef9e5188e59abcc88a675531
parent2053c40caad84d97c0150789886a681bf0e60721
Merged.