Merge remote-tracking branch 'upstream/master' into bwm-ng
authorJulen Landa Alustiza <redacted>
Thu, 18 Jun 2015 16:48:31 +0000 (18:48 +0200)
committerJulen Landa Alustiza <redacted>
Thu, 18 Jun 2015 16:48:31 +0000 (18:48 +0200)

Trivial merge
git clone https://git.99rst.org/PROJECT