Merge commit 'snapshot-start' into stable
authorIan Beckwith <ianb@erislabs.net>
Wed, 7 Sep 2011 22:58:03 +0000 (23:58 +0100)
committerIan Beckwith <ianb@erislabs.net>
Wed, 7 Sep 2011 22:58:03 +0000 (23:58 +0100)
commitc6d98d8cd52c163c2dba42a41da25356c4dad9f0
treea58f7789af648528fe2a07077ca67b0316a030e5
parentccd7ccb010c3a2a509ac39236a4411581368148c
parent0ba19fcc5ff43167939e465af4b93f965fffcc8c
Merge commit 'snapshot-start' into stable