Merge branch 'bug/133' into for-steve
authorSebastian Freundt <hroptatyr@fresse.org>
Sun, 8 Jan 2012 03:01:27 +0000 (03:01 +0000)
committerSebastian Freundt <hroptatyr@fresse.org>
Sun, 8 Jan 2012 03:01:27 +0000 (03:01 +0000)
* bug/133:
  Summary: fix, bug 133, for real now Keywords: bug fix


Trivial merge