This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 80a5cc5609f717be24c2ca5f3f60b46412dc11cd (commit) via d6413caa722ca750234a0227b36a6cd9ec51071e (commit) from 89e9f46e5bbce78e0b528d183a7ed805ae998f1a (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 80a5cc5609f717be24c2ca5f3f60b46412dc11cd Merge: 89e9f46 d6413ca Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Aug 7 15:11:47 2014 +0200

Merge remote-tracking branch 'amarx/ACCOUNTING' into next

commit d6413caa722ca750234a0227b36a6cd9ec51071e Author: Alexander Marx alexander.marx@ipfire.org Date: Thu Aug 7 15:10:11 2014 +0200

squid-accounting: get trafficdata from LAST month, when month has changed

-----------------------------------------------------------------------

Summary of changes: src/squid-accounting/acct.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

Difference in files: diff --git a/src/squid-accounting/acct.pl b/src/squid-accounting/acct.pl index 59898b7..d535901 100755 --- a/src/squid-accounting/acct.pl +++ b/src/squid-accounting/acct.pl @@ -209,7 +209,7 @@ sub sendbill { my $cur = $_[2]; my @now = localtime(time); $now[5] = $now[5] + 1900; - my $actmonth = $now[4]+1; + my $actmonth = $now[4]; my $month = '0'.$actmonth if $actmonth < 10; my $actyear = $now[5]; my ($from,$till)=&ACCT::getmonth($actmonth,$actyear); #FIXME month and year as variables!

hooks/post-receive -- IPFire 2.x development tree