Merge tag 'upstream/3.0'
authorSophie Brun <sophie@freexian.com>
Mon, 24 Nov 2014 09:04:16 +0000 (10:04 +0100)
committerSophie Brun <sophie@freexian.com>
Mon, 24 Nov 2014 09:04:16 +0000 (10:04 +0100)
Upstream version 3.0


Trivial merge