[SCM] rosegarden/master: Merge tag 'upstream/15.12.1'

[stuart at users.alioth.debian.org]

Imported Upstream version 15.12.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 89e711f518f59c9dc660d88affba1aeb0499546b
X-Git-Newrev: 6198e1d07349ec194311858f27c28cff9824fd72

The following commit has been merged in the master branch:
commit 316913245b2c7fcb8a5ea81366bc548d12a6b440
Merge: 89e711f518f59c9dc660d88affba1aeb0499546b 7a3dfd4f50da2e2149434ab7f1491f768650ed71
Author: Stuart Prescott <stuart at debian.org>
Date:   Wed Jan 6 16:43:56 2016 +1100

    Merge tag 'upstream/15.12.1'
    
    Upstream version 15.12.1
    
    # gpg: Signature made Wed 06 Jan 2016 16:43:52 AEDT using RSA key ID 1396F2F7
    # gpg: Good signature from "Stuart Prescott <stuart at nanonanonano.net>"
    # gpg:                 aka "Stuart Prescott <stuart+debian at nanonanonano.net>"
    # gpg:                 aka "Stuart Prescott <stuart at debian.org>"

diff --combined .gitignore
index c293ff3,6aafe79..fba3a65
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,6 +1,7 @@@
 +.pc
  aclocal.m4
  autom4te.cache
+ build
  config.log
  config.status
  configure

-- 
rosegarden packaging