[atril] branch master updated (561b465 -> 4efcee1)

[Mike Gabriel]

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

sunweaver pushed a change to branch master
in repository atril.

      from  561b465   debian/{changelog,control}: resolve merge conflict
       new  a23f880   Revert "prepared for Debian"
       new  4efcee1   upload to unstable (debian/1.20.0-1)

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/changelog | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/atril.git