[debian-edu-commits] debian-edu/ branch master updated (2d2c7e9 -> 519fb1f)

[Hans Arthur Kielland Aanesen]

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

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

      from  2d2c7e9   oversatt 948-951
       new  c06c070   Oversatt linje 11 til norsk
       new  519fb1f   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                 | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

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