This is an automated email from the git hooks/post-receive script. lkajan pushed a commit to branch master in repository freecontact.
commit 1eb830fcf105b9cecf712d178db74fb023f998e9 Merge: 876fcb3 a603e0a Author: Laszlo Kajan <[email protected]> Date: Wed Sep 18 16:02:13 2013 +0200 Merge tag 'upstream/1.0.18' Upstream version 1.0.18 Conflicts: aclocal.m4 ChangeLog | 8 + Makefile.in | 10 +- aclocal.m4 | 687 ++++++++++++++++++++++++++++++++++--------------------- compile | 347 ++++++++++++++++++++++++++++ configure | 175 +++++++++++++- configure.ac | 3 +- lib/Makefile.in | 6 +- lib/config.h | 9 +- lib/config.hin | 3 + missing | 461 ++++++++++++------------------------- src/Makefile.in | 2 +- 11 files changed, 1123 insertions(+), 588 deletions(-) -- Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/freecontact.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
