merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2014-03-27 04:32:29
Author local date 2014-03-27 05:32:29 +0100
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2014-03-27 04:32:29
Committer local date 2014-03-27 05:32:29 +0100
Commit d06d7d6f89a97e7fccf799a3bdc1189214cd835d
Tree c58dfc177f0112bcdc1f5a0b3555a72985e22fb0
Parent 29764a583a9666b5c714d960b36ce391f056d753
Parent 19aebd377ce70b069d0f1eca6808a6e3422ce0f6
merged.
ViewGit