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)
commit99ab8cabc02b9ed2717af651203b42f11e6a8276
tree1f99d592032ff759b096aaac140ec88cfa7f58f6
parentcb5ef4c09ea1ab8fc30622c893c513b22cc98514
parentfe72c4c55bd65772aa5a4130309150ffca1749ab
Merge branch 'master' into disable_trust_ident