view .svn/pristine/c4/c47ea70159d60a5c0573c2a0aac115d020f1fa5a.svn-base @ 924:18beae6cb226 cannam_integration

Merge from branch "cannam"
author Chris Cannam
date Tue, 13 Mar 2012 16:34:52 +0000
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