Merge branch 'master' of git+ssh://openadk.org/git/openadk
commitd2081213352e456f7596f22e0b37b682204c4cfe
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>
Tue, 5 Nov 2013 20:23:42 +0000 (5 21:23 +0100)
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>
Tue, 5 Nov 2013 20:23:42 +0000 (5 21:23 +0100)
tree8b1444fa072bb46f4483f0a8f114c955b6fb987f
parent4bef9a612a73c5b18bad38c1ef4ae4924c719ecc
parent0d26df21995dc2f25041974fb6faf3ec31be6467
Merge branch 'master' of git+ssh://openadk.org/git/openadk