[esorex] 01/03: Merge branch 'upstream' into debian

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository esorex.

commit 0e49e42209d4a2022ecdfee09bdd2d8f5b126e4b
Merge: 17edf60 c69b62a
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Sep 27 22:32:19 2014 +0200

    Merge branch 'upstream' into debian

 Makefile.in           |  86 ++++++++----
 aclocal.m4            | 352 +++++++++++++++++++++++++++++++++-----------------
 admin/compile         |   2 +-
 admin/config.guess    | 177 ++++++++++++++-----------
 admin/config.sub      |  70 +++++-----
 admin/depcomp         |   5 +-
 admin/missing         |   6 +-
 admin/test-driver     |  22 +++-
 config.h.in           |   3 -
 configure             | 262 +++++++++++++++++--------------------
 configure.ac          |   2 +-
 etc/Makefile.in       |  60 ++++++---
 src/Makefile.in       |  79 +++++++----
 src/er_main.c         |  35 ++++-
 src/er_paf.c          | 129 +++++++++++-------
 src/er_plugin.c       | 134 ++++++++++++-------
 src/er_plugin.h       |  26 +---
 src/tests/Makefile.in |  67 +++++++---
 18 files changed, 926 insertions(+), 591 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/esorex.git