Merge branch 'issue-1980'
commit0d1afbac8e6cff93f62eeb777ed7ecaf758dfc2c
authorSven Strickroth <email@cs-ware.de>
Thu, 26 Dec 2013 21:20:04 +0000 (26 22:20 +0100)
committerSven Strickroth <email@cs-ware.de>
Thu, 26 Dec 2013 21:20:04 +0000 (26 22:20 +0100)
tree5439077c72ba5628e5c3078174820f9e5a69a15a
parentb6361b7cbfdb49580add8af21dd1d216b93da7ac
parent6d59d855edf41176205424a783df82bdddb79615
Merge branch 'issue-1980'