Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2013-07-28 20:36:42
Author local date 2013-07-28 22:36:42 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2013-07-28 20:36:42
Committer local date 2013-07-28 22:36:42 +0200
Commit 922add89911f9c5bbb53a65bd9d52a2073cb4e10
Tree 5dc512471a299a530035d54eda79aeb8c30f164b
Parent 540d373fd58c0d6477560ae8896ff4a18da67c66
Parent 67b729e09775bf4fde3de1d0d2eebb14dea3b217
Merged.
ViewGit