Merge branch 'master' of ssh://debienna.at/debienna
authorMarkus Raab <elektra@markus-raab.org>
Thu, 5 Jun 2014 11:10:40 +0000 (13:10 +0200)
committerMarkus Raab <elektra@markus-raab.org>
Thu, 5 Jun 2014 11:10:40 +0000 (13:10 +0200)
commitde005bf0fecf93f6755a25bb38ee7378d40a4319
tree12c63f377b2b88fa9e3339e546487caca5449193
parent12036822874b8259b1aa57e142d7e5be490e5257
parentaf9a7f02a12e8e335bbfbab7faf58df40a1055fb
Merge branch 'master' of ssh://debienna.at/debienna