[elmer-doc] 01/02: Merge remote-tracking branch 'origin/master' into launchpad

[Boris Pek]

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

tehnick pushed a commit to branch launchpad
in repository elmer-doc.

commit d2fd90d2c237fb91d46e371da11a807d4498aa6b
Merge: a51e845 e105e7b
Author: Boris Pek <tehnick-8 at yandex.ru>
Date:   Tue Feb 4 23:35:27 2014 +0400

    Merge remote-tracking branch 'origin/master' into launchpad

 debian/changelog | 13 +++++++------
 debian/control   |  2 +-
 debian/copyright |  6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

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