Merge branch 'master' of ssh://debienna.at/debienna
authorMarkus Raab <elektra@markus-raab.org>
Tue, 3 Dec 2013 14:47:10 +0000 (15:47 +0100)
committerMarkus Raab <elektra@markus-raab.org>
Tue, 3 Dec 2013 14:47:10 +0000 (15:47 +0100)
commit73450bcacd6925dcd99149e732b799ab3ee03ead
tree38c08e1e79a7ac8c40fc960b91f15ed7273892ea
parent233126969c1282a756e32fd6f4f1ecf6f2e91676
parentc4d66ba4cabc7066ff7a79375224a414ac62b1d6
Merge branch 'master' of ssh://debienna.at/debienna