From: Maksym Sobolyev <sobomax@sippysoft.com>
Date: Mon, 27 Oct 2014 17:58:45 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v1.5.0-rc1~6^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3a6f7f3181b618c7604b85e9d13d204bf9a196d;p=thirdparty%2Frrdtool-1.x.git

Merge remote-tracking branch 'upstream/master'
---

f3a6f7f3181b618c7604b85e9d13d204bf9a196d