view .svn/pristine/c4/c47ea70159d60a5c0573c2a0aac115d020f1fa5a.svn-base @ 1430:04cc33a44d4c live

Merge from branch "cannam"
author Chris Cannam
date Wed, 09 Oct 2013 17:41:45 +0100
parents cbb26bc654de
children
line wrap: on
line source
welcome:
  id: 1
  title: Welcome to the weblog
  lock_version: 24
  type: LockedPage
thinking:
  id: 2
  title: So I was thinking
  lock_version: 24
  type: SpecialLockedPage