Merge remote-tracking branch 'mfischer/curl' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 16:51:59 +0000 (17:51 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 16:51:59 +0000 (17:51 +0100)

Trivial merge