Merged.
authorPascal J. Bourguignon <pjb@informatimago.com>
Sun, 26 May 2013 21:12:05 +0000 (23:12 +0200)
committerPascal J. Bourguignon <pjb@informatimago.com>
Sun, 26 May 2013 21:12:05 +0000 (23:12 +0200)
commit2196302e7a2a245fb3a5ad1cd8127ed0b2085ba7
tree94bb59e9a211dcae01f5f78c46bd10d852674ef8
parenta2e9ea1f4428cedd817bc862f3112cde18592d6a
parent1a95e5becfd363d820844eb62a0a912883ab9408
Merged.