Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Wed, 13 Apr 2011 23:02:51 +0000 (00:02 +0100)
committerIan Beckwith <ianb@erislabs.net>
Wed, 13 Apr 2011 23:02:51 +0000 (00:02 +0100)
commit76bcf6213d2a5a01dd56c0d1235bfdad4dd7ecf2
treef022905f87c69a1fccacbb31b5d0b6059fec4236
parent9ada6e7b5cf3aa507b6b54e47775c29ffd1378d3
parent08f588732c09e0a8575e52c7478cbad99aa1b8eb
Merge branch 'stable'