From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 29 May 2014 21:37:56 +0000 (+0200)
Subject: Merge branch 'cacti-update' into next
X-Git-Tag: v2.15-core79~40^2~1^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9c6910d5498fd0a3756441fb3b3100d1520fe71;p=ipfire-2.x.git

Merge branch 'cacti-update' into next
---

d9c6910d5498fd0a3756441fb3b3100d1520fe71