Merge remote-tracking branch 'origin/upstream' into 1.0
commit474700954dda085369a77e76c1c13a2c93b0a7e1
authorWaldemar Brodkorb <wbx@openadk.org>
Wed, 4 Mar 2015 19:37:16 +0000 (4 13:37 -0600)
committerWaldemar Brodkorb <wbx@openadk.org>
Wed, 4 Mar 2015 19:37:16 +0000 (4 13:37 -0600)
tree8c4f30736e3331d09d0525847b48d49b40f39889
parent885d9c24d4c21da941603baf555fc72a3765bbe3
parent8e5113112ae7d3402e2afb01c8cee18d3beb0f2e
Merge remote-tracking branch 'origin/upstream' into 1.0