[med-svn] [king] 04/07: Merge tag 'upstream/2.23.161103+dfsg1'

[Andreas Tille]

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

tille pushed a commit to branch master
in repository king.

commit 21461c79b5c56e12de3b242fb86e67d919f153b8
Merge: a251a7a 36c8ff3
Author: Andreas Tille <tille at debian.org>
Date:   Sun Dec 4 13:50:21 2016 +0100

    Merge tag 'upstream/2.23.161103+dfsg1'
    
    Upstream version 2.23.161103+dfsg1

 chiropraxis/resource/chiropraxis/buildnum.props | 3 ---
 driftwood/resource/driftwood/buildnum.props     | 3 ---
 extratools/resource/extratools/buildnum.props   | 3 ---
 king/resource/king/buildnum.props               | 3 ---
 molikin/resource/molikin/buildnum.props         | 3 ---
 5 files changed, 15 deletions(-)

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