Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2013-06-17 21:34:23
Author local date 2013-06-17 23:34:23 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2013-06-17 21:34:23
Committer local date 2013-06-17 23:34:23 +0200
Commit 2053c40caad84d97c0150789886a681bf0e60721
Tree cb0d460c5815fe1f5e1e5580d54ed1b240b48ef7
Parent c56dc20e66aaf25f9fa63fc3d503f23f9e7813fe
Parent bcf97eb131cee2d1c7f9b575330f09048a0c96ae
Merged.
ViewGit