Merge tag 'snapshot-start' into stable
authorIan Beckwith <ianb@erislabs.net>
Sun, 2 Feb 2014 23:54:29 +0000 (23:54 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sun, 2 Feb 2014 23:54:29 +0000 (23:54 +0000)
snapshot-start is currently a39d4083cab589d7cd6a13e8a4b8db8875261d75


Trivial merge