Merged.
authorPascal J. Bourguignon <pjb@informatimago.com>
Mon, 24 Jun 2013 20:06:18 +0000 (22:06 +0200)
committerPascal J. Bourguignon <pjb@informatimago.com>
Mon, 24 Jun 2013 20:06:18 +0000 (22:06 +0200)
commit10c44088e44962428bceeae215d36d3a66220ab5
treee40e3cefde9fb47394e8c393872e4570081fd9bf
parent9473527158bd558691c10eb95d9d55f92f36d30b
parentb5be0ade4ffad8fdda70ce557530d76655b46512
Merged.