merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2014-03-17 12:55:12
Author local date 2014-03-17 13:55:12 +0100
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2014-03-17 12:55:12
Committer local date 2014-03-17 13:55:12 +0100
Commit 65287a02401ce37e13af1a49e58231c7c8bb0f22
Tree 8cefe1188b74f10603503b17c663366d0e4e469a
Parent 5dd6c595f478ff1fb76fc7829b47d1d1d645853b
Parent 2d42423edc1f7a1c9ca2cbc91611340d7c68f2b4
merged.
ViewGit