Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Thu, 8 Sep 2011 19:15:16 +0000 (20:15 +0100)
committerIan Beckwith <ianb@erislabs.net>
Thu, 8 Sep 2011 19:15:16 +0000 (20:15 +0100)
commit1fd8cad93b2ad72a6b8de912cf0e3630b98fe19c
tree942acc57aa7e8bf5760737c744c3e048e052cb62
parent88b4008a4c7cb612e2fe9ce0d2168d8faad0d3f4
parent1c17f62209b5536711bc5c17a7814db8eff5df25
Merge branch 'stable'