Merge pull request #118 from oneru/master
authorsbyx <steven@midlink.org>
Wed, 23 Jul 2014 12:41:03 +0000 (14:41 +0200)
committersbyx <steven@midlink.org>
Wed, 23 Jul 2014 12:41:03 +0000 (14:41 +0200)
Update to 2.3.6


Trivial merge