Merge branch 'more-oo'
commitb0fdea6944ecd1ae1c0f8daad403d9df2c64e127
authorSven Strickroth <email@cs-ware.de>
Tue, 29 Jul 2014 11:43:46 +0000 (29 13:43 +0200)
committerSven Strickroth <email@cs-ware.de>
Tue, 29 Jul 2014 11:58:15 +0000 (29 13:58 +0200)
tree0539016e434b152e8050b18cafeb8bad21773fd3
parent49be42cd0d1bf8ab9cb802fb9eda504327bc29d0
parent059c882c355828a9e2caa91988a06a56bbd67445
Merge branch 'more-oo'

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