[astromenace-data] 01/02: Merge branch 'master' into wheezy-backports

[Boris Pek]

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

tehnick pushed a commit to branch wheezy-backports
in repository astromenace-data.

commit 4900b55f6c4d662b41ea9f875b991dc9b54ab7b0
Merge: 4ac40c6 be10447
Author: Boris Pek <tehnick-8 at yandex.ru>
Date:   Thu Dec 26 17:20:25 2013 +0400

    Merge branch 'master' into wheezy-backports

 debian/changelog | 11 ++++++++---
 debian/control   |  4 ++--
 debian/copyright |  4 ++--
 debian/rules     | 16 +++++++++-------
 4 files changed, 21 insertions(+), 14 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/astromenace-data.git