Merge branch 'unstable'
authorSalim Fadhley <sal@stodge.org>
Sat, 29 Jun 2013 23:24:32 +0000 (00:24 +0100)
committerSalim Fadhley <sal@stodge.org>
Sat, 29 Jun 2013 23:24:32 +0000 (00:24 +0100)
commitd2a5d435fa2df3bff572bd06e43c86544749c5d2
treeb97d92f407b8b884bc9d4dfdf4546162cf547fec
parent0ed3a52f6fcde56d6a53360f87a4cf4647c61664
parentca71b8777260e3335cf0f3e08900b4333b340052
Merge branch 'unstable'