[simplyhtml] 03/03: Merge remote-tracking branch 'origin/master'

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository simplyhtml.

commit 05d880ac8d76c424b36f039d0f3a44e5c798f71b
Merge: 1d5de40 8b7e8b7
Author: Felix Natter <fnatter at gmx.net>
Date:   Thu Nov 7 19:52:40 2013 +0100

    Merge remote-tracking branch 'origin/master'

 debian/changelog |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git