[debian-edu-commits] debian-edu/ 02/02: merge da origin master

[Claudio Carboncini]

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

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

commit 83124acbd3ce224cd03a01193756aa803d368137
Merge: e25a53b 664e3e8
Author: karbon-guest <claudio.carboncini at gmail.com>
Date:   Fri Dec 19 20:50:54 2014 +0100

    merge da origin master
    
    Merge branch 'master' of git+ssh://git.debian.org/git/debian-edu/debian-edu-doc

 debian/changelog                                   |     7 +-
 .../debian-edu-jessie-manual.nb.po                 |  1774 +--
 .../debian-edu-wheezy-manual.nb.po                 | 10844 +++----------------
 3 files changed, 2545 insertions(+), 10080 deletions(-)

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