[debian-edu-commits] debian-edu/ branch master updated (519fb1f -> 0e2c021)

[Ole-Erik Yrvin]

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

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

      from  519fb1f   Conflict resolved Merge branch 'master' of git+ssh://git.debian.org/git/debian-edu/debian-edu-doc
       new  aa52c37   endring på 473-720
       new  0e2c021   Conflict resolved Merge branch 'master' of git+ssh://git.debian.org/git/debian-edu/debian-edu-doc

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../debian-edu-wheezy-manual.nb.po                 | 168 +++++++++++++++++----
 1 file changed, 141 insertions(+), 27 deletions(-)

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