Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Mon, 19 Apr 2010 16:51:17 +0000 (17:51 +0100)
committerIan Beckwith <ianb@erislabs.net>
Mon, 19 Apr 2010 16:51:17 +0000 (17:51 +0100)
commitfb480c11cabf8b1b2f3601a6930037f992b7ceed
tree3285008d345a502d6709827f0d4713b6aef8f1b3
parent94532627c4eae181840a65fd3f44c9205c4a3591
parent23a67dcd6dc923176bfe8e3f0c49b44fa822b7eb
Merge branch 'stable'