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)
commit6dfa9e5718df60aea5a12b5a4ae28da28a29f54e
treeefffe798429768920f8ec2db1849d2fe02cf168c
parentff2f663ebca80be4991c71be724d5a29ef5a3bdf
parent0d02a35cc1f0798e1be6861433a7e78602f0b90f
Merge remote-tracking branch 'jakub-kicinski/for-master'