Merge branch '2.0'
authorOlivier Goffart <ogoffart@woboq.com>
Fri, 7 Aug 2015 09:31:44 +0000 (11:31 +0200)
committerOlivier Goffart <ogoffart@woboq.com>
Fri, 7 Aug 2015 09:31:44 +0000 (11:31 +0200)
commit68cff5cd102254d14972a9e37b8c1b18a426c315
tree0a10dd22c8d00b8da27d825781f75cdd71366ff4
parentee75d37983af360095edf516a5cd37c6212172fb
parentb906c70a86eebfea25acad3792370c9cd60b4e3c
Merge branch '2.0'