From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 20 Mar 2014 22:16:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'alfh/feature_vnstat_1.11' into beyond-next
X-Git-Tag: v2.15-core79~102^2~4
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=fc84e6ec23f824f6a72935c0d274ac4fe948f0a0

Merge remote-tracking branch 'alfh/feature_vnstat_1.11' into beyond-next
---

fc84e6ec23f824f6a72935c0d274ac4fe948f0a0
diff --cc config/rootfiles/common/vnstat
index 57c54dbef6,4ddec4a9ce..faabf47e8a
--- a/config/rootfiles/common/vnstat
+++ b/config/rootfiles/common/vnstat
@@@ -2,5 -2,11 +2,10 @@@
  #etc/cron.d/vnstat
  etc/vnstat.conf
  usr/bin/vnstat
+ usr/bin/vnstati
+ #usr/sbin/vnstatd
+ #usr/share/man/man5/vnstat.conf.5
+ #usr/share/man/man1/vnstatd.1
+ #usr/share/man/man1/vnstati.1
  #usr/share/man/man1/vnstat.1
  #var/lib/vnstat
 -