view .svn/pristine/c4/c47ea70159d60a5c0573c2a0aac115d020f1fa5a.svn-base @ 1386:e4c393cebb1a luisf

Merger from testing branch.
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Tue, 24 Sep 2013 16:25:05 +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