[debian-edu-commits] debian-edu/ 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/debian-edu/debian-edu-doc

[Ingrid Yrvin]

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

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

commit a5be9d7ba6b315ef8d32786a25af1fab02a21c3c
Merge: fcc28c0 ec01bec
Author: Ingrid Yrvin <iyrvin at hagan.no>
Date:   Sun May 11 18:14:05 2014 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/debian-edu/debian-edu-doc
    
    Conflicts:
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po

 .../debian-edu-wheezy-manual.nb.po                 | 167 ++++++++++++++++++++-
 1 file changed, 162 insertions(+), 5 deletions(-)


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