merged.
authorPascal J. Bourguignon <pjb@informatimago.com>
Sat, 12 Apr 2014 23:39:47 +0000 (01:39 +0200)
committerPascal J. Bourguignon <pjb@informatimago.com>
Sat, 12 Apr 2014 23:39:47 +0000 (01:39 +0200)
commit6afb265255313bba05603887121077d1785caa47
tree347b1e7be743ea528d71d7482e4b99b99bc85f81
parent3615de8d685b2db3b847d535b7b47cc8cb3380fe
parent7beac29a880f89a7791f34a8395f4ad490575a54
merged.