Merged.
authorPascal J. Bourguignon <pjb@informatimago.com>
Sun, 28 Jul 2013 20:36:42 +0000 (22:36 +0200)
committerPascal J. Bourguignon <pjb@informatimago.com>
Sun, 28 Jul 2013 20:36:42 +0000 (22:36 +0200)
commit922add89911f9c5bbb53a65bd9d52a2073cb4e10
tree5dc512471a299a530035d54eda79aeb8c30f164b
parent540d373fd58c0d6477560ae8896ff4a18da67c66
parent67b729e09775bf4fde3de1d0d2eebb14dea3b217
Merged.