commit | 086bfcc8a179ba7a5ba169f6c329777e50384fe2 | [log] [tgz] |
---|---|---|
author | Grégoire Dupé <gdupe@mia-software.com> | Tue Jan 31 10:38:26 2017 +0100 |
committer | Grégoire Dupé <gdupe@mia-software.com> | Tue Jan 31 10:38:26 2017 +0100 |
tree | 982eb3650f2b1f16b64830db8ad6cbbb7a93fe8b | |
parent | da78971b8896a41eb320e2b2e921ceca8523e6b9 [diff] | |
parent | 8d70b691eff6d005db287cffcef6895436632ecc [diff] |
Merge branch 'maintenance-1.0' into master-2