Merge remote-tracking branch 'origin/upstream'
commita5352e212fcd4da83c8ff4fe542ef23c8e3187f8
authorWaldemar Brodkorb <wbx@openadk.org>
Wed, 27 Aug 2014 19:38:44 +0000 (27 21:38 +0200)
committerWaldemar Brodkorb <wbx@openadk.org>
Wed, 27 Aug 2014 19:38:44 +0000 (27 21:38 +0200)
tree016dd4cf4a39ddef717a1de7f7ace0305ffa0e75
parent91b2dfd68f5aecc290a449905aa7456f27f10326
parentc6e8f34a358f846aa15cb9f53251da3d6668abd1
Merge remote-tracking branch 'origin/upstream'