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)

Trivial merge