[debian-edu-commits] debian-edu/ 03/08: Merge tag 'upstream/0.4.5'

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository slbackup-php.

commit 0ff36e86acf124407205103ad86a93a61f27491d
Merge: e565fcb 59b350e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jan 5 10:18:54 2014 +0000

    Merge tag 'upstream/0.4.5'
    
    Upstream version 0.4.5
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

 ChangeLog             | 10 ++++++++++
 src/index.php         | 10 +++++-----
 templates/config.tpl  |  9 +++------
 templates/maint.tpl   |  6 ++----
 templates/restore.tpl |  6 ++----
 5 files changed, 22 insertions(+), 19 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/slbackup-php.git