Merge branch 'pull-rebase'
commit7727feb576716c5af9e4a9b4ba97eb2e5e8ee3dc
authorSven Strickroth <email@cs-ware.de>
Sun, 5 Oct 2014 10:55:06 +0000 (5 12:55 +0200)
committerSven Strickroth <email@cs-ware.de>
Sun, 5 Oct 2014 10:55:06 +0000 (5 12:55 +0200)
tree65e09a5dc1484baa4f63d226f2c47f3368efcf0c
parentbf9f3395d92d27892cc6bf455e8b699cc667eec5
parentcc54a725ca36ec2803017ea961ae78c4d1b838dc
Merge branch 'pull-rebase'