Merge branch 'non-std-time-signature'
authorStefan Westerfeld <stefan@space.twc.de>
Mon, 16 May 2011 14:33:21 +0000 (16:33 +0200)
committerStefan Westerfeld <stefan@space.twc.de>
Mon, 16 May 2011 14:33:21 +0000 (16:33 +0200)
commit7d02e14496955c2dcc95a57166977eb09df03849
tree935c7647ebdfa7964e7c38dab05c1226f164f3c5
parent224ae73a2e039abc868ad7fd6385e56b45b7f587
parent8ddc51751deea0760b728de9a859f7e9e365cd2b
Merge branch 'non-std-time-signature'