Merge branch 'develop' into notes
authorPaul Brossier <piem@piem.org>
Wed, 12 Aug 2015 17:21:38 +0000 (19:21 +0200)
committerPaul Brossier <piem@piem.org>
Wed, 12 Aug 2015 17:21:38 +0000 (19:21 +0200)
commitb257b60e3e1004a168b81130924fdd1ab4a9f0c3
treece17469305d67a26ff45218f53a3f99e351778aa
parent3a1a5d6e084d4358419d099f04daa3a600cd1e99
parent7b2d7402b3a3660d4ed2b32ae5378230ab5058fe
Merge branch 'develop' into notes