Merge patch from Florian
authorJoachim Breitner <mail@joachim-breitner.de>
Sun, 10 Feb 2013 21:57:38 +0000 (21:57 +0000)
committerJoachim Breitner <mail@joachim-breitner.de>
Sun, 10 Feb 2013 21:57:38 +0000 (21:57 +0000)
commitcf06d04dc05205af0734dd8e90be7aeea759980f
tree52d08a085f6b394892cad0a62c57792e507499a2
parentb5743a39136244d76686c1d0996debdcf39a0ea9
Merge patch from Florian
sm.c