From: Timo Kokkonen <timo.t.kokkonen@iki.fi>
Date: Sun, 26 Oct 2014 15:35:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.itanic.dy.fi/?p=rrdd;a=commitdiff_plain;h=16a1bfcf89bd856f433bea1e973c943d8a4fcde5

Merge remote-tracking branch 'origin/master'

Signed-off-by: Timo Kokkonen <timo.t.kokkonen@iki.fi>
---

16a1bfcf89bd856f433bea1e973c943d8a4fcde5