Merged.
authorPascal J. Bourguignon <pjb@informatimago.com>
Fri, 28 Jun 2013 23:29:36 +0000 (01:29 +0200)
committerPascal J. Bourguignon <pjb@informatimago.com>
Fri, 28 Jun 2013 23:29:36 +0000 (01:29 +0200)
commit066d627ecf911e4375a958acdd035d1e463a72da
tree647ee1ab9f57e7850ac91964fbc59affc4a4ea6c
parent9b86f8e65b566c4e57974f44d27bc072ea48aa31
parentff8f37426d849ae26000f566a7b5986ea281fa4c
Merged.