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, fifteen has been updated via 0b7f6aa4d9d0f6c17d668620000c4496eb96e34c (commit) via 9a6b4cb648b871fcfce9a386213e5ab6f8b7bba9 (commit) from 568438067cfef263b683f97b9350776f62396e04 (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 0b7f6aa4d9d0f6c17d668620000c4496eb96e34c Merge: 5684380 9a6b4cb Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 14 14:13:39 2013 +0200

Merge branch 'next' into fifteen

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

Summary of changes: config/rootfiles/oldcore/73/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

Difference in files: diff --git a/config/rootfiles/oldcore/73/update.sh b/config/rootfiles/oldcore/73/update.sh index 6730e0d..ee799ad 100644 --- a/config/rootfiles/oldcore/73/update.sh +++ b/config/rootfiles/oldcore/73/update.sh @@ -47,7 +47,7 @@ if [ -e "/var/ipfire/proxy/enable" ] || [ -e "/var/ipfire/proxy/enable_blue" ]; eval $(/usr/local/bin/readhash /var/ipfire/proxy/advanced/settings)

TRANSPARENT_PORT="$(( ${PROXY_PORT} + 1 ))" - echo "TRANSPORT_PORT=${TRANSPARENT_PORT}" >> /var/ipfire/proxy/advanced/settings + echo "TRANSPARENT_PORT=${TRANSPARENT_PORT}" >> /var/ipfire/proxy/advanced/settings ) fi

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