[esorex] 01/02: 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 826b83baacbec57664c45913e92374b4120f132a
Merge: d6103f7 199abcd
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 10 13:06:48 2015 +0100

    Merge branch 'upstream' into debian

 AUTHORS      |  7 +++----
 COPYING      |  4 ++--
 configure    | 20 ++++++++++----------
 configure.ac |  2 +-
 4 files changed, 16 insertions(+), 17 deletions(-)

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