Merge branch 'master' of ssh://debienna.at/debienna
authorMarkus Raab <elektra@markus-raab.org>
Sun, 12 Jan 2014 14:38:37 +0000 (15:38 +0100)
committerMarkus Raab <elektra@markus-raab.org>
Sun, 12 Jan 2014 14:38:37 +0000 (15:38 +0100)
commit9010e9684a860aa28db13b1d059cba4d0ae965e9
treeb88ef6c312fbcdccc90b235f1fbcd9126b8669e9
parent24b044cfe12f458db3e2f02a0dbc18927d379d2d
parentdee9453e3ec482f3c1a4a039a0a2a8e698534493
Merge branch 'master' of ssh://debienna.at/debienna