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

[Ole-Erik Yrvin]

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

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

commit d9f2be592a31cee5cc94f97ffe094b64ddbd9979
Merge: 2ff8160 75459d4
Author: Ole-Erik Yrvin <oeyrvin at hagan.no>
Date:   Sun Jun 15 17:05:12 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                 | 173 ++++++++++-----------
 1 file changed, 82 insertions(+), 91 deletions(-)


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