Merge branch 'master' into experimental/master
authorStephane Glondu <steph@glondu.net>
Sat, 21 Jul 2012 13:13:51 +0000 (15:13 +0200)
committerStephane Glondu <steph@glondu.net>
Sat, 21 Jul 2012 13:41:04 +0000 (15:41 +0200)
commitd0dd1b724156a0dc0867dcc2343d0277c12c8c06
tree376945c3f81ced7812069c1d1fdbd2c1f641944b
parent8cc09d9279c35fad3422169e6ddbc9dc78f3a3e1
parent560bdc6a5d31582c4330f60a81be69b196c27b1a
Merge branch 'master' into experimental/master

Conflicts:
patch for Debian-specific behaviour of -custom
debian/changelog
debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch