Merge branch 'rebase-onto'
commit1379434bdf753c6272c7fb2d0ddd70b7e2c0ef58
authorSven Strickroth <email@cs-ware.de>
Sat, 14 Feb 2015 18:35:07 +0000 (14 19:35 +0100)
committerSven Strickroth <email@cs-ware.de>
Sun, 15 Feb 2015 13:26:28 +0000 (15 14:26 +0100)
tree76950ece24d26691cf2ea109f827d120653b1f24
parent383322eae3a20b8c48e9439a5eb82623be809185
parent9dc5032d635cb84aaafbb140795384c7f962b57a
Merge branch 'rebase-onto'

Signed-off-by: Sven Strickroth <email@cs-ware.de>