]> git.itanic.dy.fi Git - rrdd/commitdiff
Merge remote-tracking branch 'origin/master'
authorTimo Kokkonen <timo.t.kokkonen@iki.fi>
Sun, 26 Oct 2014 15:35:34 +0000 (17:35 +0200)
committerTimo Kokkonen <timo.t.kokkonen@iki.fi>
Sun, 26 Oct 2014 15:35:52 +0000 (17:35 +0200)
Signed-off-by: Timo Kokkonen <timo.t.kokkonen@iki.fi>

Trivial merge