annotate .svn/pristine/c4/c47ea70159d60a5c0573c2a0aac115d020f1fa5a.svn-base @ 1022:f2ec92061fca browsing

Merge from live branch
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Tue, 13 Nov 2012 10:35:40 +0000
parents cbb26bc654de
children
rev   line source
Chris@909 1 welcome:
Chris@909 2 id: 1
Chris@909 3 title: Welcome to the weblog
Chris@909 4 lock_version: 24
Chris@909 5 type: LockedPage
Chris@909 6 thinking:
Chris@909 7 id: 2
Chris@909 8 title: So I was thinking
Chris@909 9 lock_version: 24
Chris@909 10 type: SpecialLockedPage