Merge remote-tracking branch 'alfh/feature_vnstat_1.11' into beyond-next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Mar 2014 22:16:15 +0000 (23:16 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Mar 2014 22:16:38 +0000 (23:16 +0100)
1  2 
config/rootfiles/common/vnstat
make.sh

@@@ -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
 -
diff --cc make.sh
Simple merge