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 tag, v2.17-core89 has been updated to b9a927998d9832e4060737b31f0d95f5223ccb9a (commit) from 5f7a8b7e1cf7d665fc4df8757bf54d5d08903a88
- Log ----------------------------------------------------------------- commit b9a927998d9832e4060737b31f0d95f5223ccb9a Merge: 7f024f5 c63e97b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Apr 11 12:54:14 2015 +0200
Merge remote-tracking branch 'origin/master' into core89
Conflicts: config/rootfiles/core/89/update.sh src/initscripts/init.d/dnsmasq -----------------------------------------------------------------------
hooks/post-receive -- IPFire 2.x development tree