Merge branch 'master' of ssh://debienna.at/debienna
authorMarkus Raab <elektra@markus-raab.org>
Wed, 18 Dec 2013 19:15:48 +0000 (20:15 +0100)
committerMarkus Raab <elektra@markus-raab.org>
Wed, 18 Dec 2013 19:15:48 +0000 (20:15 +0100)
commit8a26e32ffb7be936b83ae62b1464334e94a2a350
treec5fa10d950d9133b18391bffea8751f9da797270
parent6c718d358854f8fc3978ced1e96bc4056ebaab4e
parent18888f101354de1ed50083d7c01c016257e240f8
Merge branch 'master' of ssh://debienna.at/debienna