Merge branch 'seating' into master
authorKonrad Rosenbaum <konrad@silmor.de>
Sat, 21 Nov 2015 13:48:37 +0000 (14:48 +0100)
committerKonrad Rosenbaum <konrad@silmor.de>
Sat, 21 Nov 2015 13:48:37 +0000 (14:48 +0100)
commitfde9f2c4ea800856241115f539bb10e676124ee8
treeabb40457be23f04fb61c00ac66325aa01919d0fb
parentfeb428a4e441052f1d6f4ccd607a5e24c721d5b8
parent32bfb9ccd20834f23c684cef75b8b3ab079b7008
Merge branch 'seating' into master