[debian-edu-commits] debian-edu/ 02/02: Merge remote-tracking branch 'origin/master'

[Petter Reinholdtsen]

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

pere pushed a commit to branch master
in repository debian-edu-doc.

commit c80aa1b6c54734c08e282a112de2145f087b72bc
Merge: 937c5b2 d781001
Author: Weblate <noreply at weblate.org>
Date:   Sun Apr 9 11:27:28 2017 +0200

    Merge remote-tracking branch 'origin/master'

 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git