Merge branch 'master' into notes
authorPaul Brossier <piem@piem.org>
Wed, 22 Jun 2016 11:00:10 +0000 (13:00 +0200)
committerPaul Brossier <piem@piem.org>
Wed, 22 Jun 2016 11:00:10 +0000 (13:00 +0200)
commitf264b173a447448e0e124df2ac309b5e482e02c9
tree11d3585dde19c8dc2509b36445e2c050cf291027
parent60fc05b3fadd7da5957eb8c531bfa882d35e6568
parent6769586029891c240afe04dec96f7c554e3803bd
Merge branch 'master' into notes