[esorex] 02/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 ac9ec5631c8e035f0b5285e14ff82a35e196abc4
Merge: 1b73346 21dabd8
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Feb 24 10:39:38 2015 +0100

    Merge branch 'upstream' into debian

 ChangeLog                    |   9 +++
 configure                    |  20 ++---
 configure.ac                 |   2 +-
 src/er_json.c                | 186 +++++++++++++++++++++++++++++++------------
 src/tests/esorex_json-test.c |  64 +++++++++++++--
 5 files changed, 214 insertions(+), 67 deletions(-)

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