Merge remote-tracking branch 'github/master'
authorIustin Pop <iustin@k1024.org>
Thu, 30 Apr 2015 20:12:53 +0000 (22:12 +0200)
committerIustin Pop <iustin@k1024.org>
Thu, 30 Apr 2015 20:12:53 +0000 (22:12 +0200)
Merge pull request made on GitHub.


Trivial merge