| commit | 025b8b226c8d8edba2b309ca878572f40512eca7 | [log] [tgz] |
|---|---|---|
| author | Maxime Biais <maxime.biais@gmail.com> | Wed Oct 05 12:02:52 2016 +0200 |
| committer | Maxime Biais <maxime.biais@gmail.com> | Wed Oct 05 12:02:52 2016 +0200 |
| tree | fb734615933a39f3d009210dc0d1457160479b35 | |
| parent | 48915a3098e013660a06d131a33becae0961ea15 [diff] | |
| parent | 70fd1e1264ca18bda051b56fba4699f5e725a673 [diff] |
Merge remote-tracking branch 'origin/release/6.0'