tree 149002b3c27148bf2d36cf12e1bd5c0a8ac0a09c
parent 74ee703656f118d47eb519ee9b5bef532da8cdf8
parent ce95ca7d4a2ff35031be66fc0923f29e9b15d500
author Paul Merlin <paul@nosphere.org> 1438079800 +0200
committer Paul Merlin <paul@nosphere.org> 1438079800 +0200

Merge branch 'release/2.1-RC1'