From: Don Armstrong <don@donarmstrong.com>
Date: Wed, 21 May 2014 20:16:09 +0000 (-0700)
Subject: Merge tag 'upstream/2.18.2' into debian
X-Git-Tag: debian/2.18.2-1~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a5489b4d1b6c7c8aac55e887ec29edcbb84fdff1;p=lilypond.git

Merge tag 'upstream/2.18.2' into debian

Upstream version 2.18.2
---

a5489b4d1b6c7c8aac55e887ec29edcbb84fdff1