Merge pull request #1420 from keszybz/doc-updates
authorDaniel Mack <github@zonque.org>
Wed, 30 Sep 2015 16:37:18 +0000 (18:37 +0200)
committerDaniel Mack <github@zonque.org>
Wed, 30 Sep 2015 16:37:18 +0000 (18:37 +0200)
Doc updates


Trivial merge