From: Maksym Sobolyev <sobomax@sippysoft.com>
Date: Fri, 26 Dec 2014 19:25:08 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v1.5.0-rc2~14^2^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f34ae3f41025e96b89d20da15de2ee578f33826b;p=thirdparty%2Frrdtool-1.x.git

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

f34ae3f41025e96b89d20da15de2ee578f33826b