Merge remote-tracking branch 'origin/upstream'
commit36043b37739dffdaea8d31457570810e492268d7
authorWaldemar Brodkorb <wbx@openadk.org>
Thu, 4 Sep 2014 13:18:54 +0000 (4 15:18 +0200)
committerWaldemar Brodkorb <wbx@openadk.org>
Thu, 4 Sep 2014 13:18:54 +0000 (4 15:18 +0200)
tree0045cba85b862ecca89cf7b5aff336bddbabad89
parenta5352e212fcd4da83c8ff4fe542ef23c8e3187f8
parent6d550ddd129b18cf800eab604f74536754526cd8
Merge remote-tracking branch 'origin/upstream'