Merge branch 'master' into disable_trust_ident disable_trust_ident
authorBernd Helmle <[email protected]>
Wed, 29 Apr 2015 20:57:48 +0000 (22:57 +0200)
committerBernd Helmle <[email protected]>
Wed, 29 Apr 2015 20:57:48 +0000 (22:57 +0200)

Trivial merge