Merge remote-tracking branch 'jakub-kicinski/for-master'
authorColin Leroy <colin@colino.net>
Thu, 18 Dec 2014 09:18:48 +0000 (10:18 +0100)
committerColin Leroy <colin@colino.net>
Thu, 18 Dec 2014 09:18:48 +0000 (10:18 +0100)

Trivial merge