Merge branch 'feat-finish-disp'
authorClifford Wolf <clifford@clifford.at>
Fri, 18 Sep 2015 07:54:49 +0000 (09:54 +0200)
committerClifford Wolf <clifford@clifford.at>
Fri, 18 Sep 2015 07:54:49 +0000 (09:54 +0200)
commit7a230d3a8dd6f19ab403cc831bf57ca31fc7f3da
tree638a93ba2e32fadb79b6f83f81c222743c5ba11f
parentd9cecabb877b1d58efc1bfcd962201eace67640d
parent9db05d17feddf7615bb8944390fa7b535cd48b12
Merge branch 'feat-finish-disp'