Merged.
authorPascal J. Bourguignon <pjb@informatimago.com>
Tue, 16 Apr 2013 09:47:14 +0000 (11:47 +0200)
committerPascal J. Bourguignon <pjb@informatimago.com>
Tue, 16 Apr 2013 09:47:14 +0000 (11:47 +0200)
commitd30fd673b4d6ef162ba94033b51946e9b8e63755
treeffd90403d19b4762acf16941608510c885a67234
parent024d789ad50810c473b7a59bc13c36a03136dc09
parentbb8dd003b22e6f6a6ff899304e3ef6389f3d4bec
Merged.