Merge branch 'master' of git+ssh://openadk.org/git/openadk
commit0aab8e46ff25176b0a80efc505126ae71b98429c
authorWaldemar Brodkorb <wbrodkorb@conet.de>
Tue, 10 Mar 2015 11:54:40 +0000 (10 12:54 +0100)
committerWaldemar Brodkorb <wbrodkorb@conet.de>
Tue, 10 Mar 2015 11:54:40 +0000 (10 12:54 +0100)
tree9ceebfc956a8b4aac5944081e75e9c701f43a917
parentb135101d3298102a90e19be56d812279136852f0
parent5f7ca45728888acf80caa879bc96ad81eaf6cafe
Merge branch 'master' of git+ssh://openadk.org/git/openadk