view .svn/pristine/3b/3b35bfc6a457be42f49a86352010582aa133bde7.svn-base @ 950:64d990177cda luisf

Merge (Bug #505 fix).
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Thu, 02 Aug 2012 19:41:29 +0100
parents cbb26bc654de
children
line wrap: on
line source
welcome_1:
  id: 1
  page_id: 1
  title: Welcome to the weblg
  version: 23
  version_type: LockedPage

welcome_2:
  id: 2
  page_id: 1
  title: Welcome to the weblog
  version: 24
  version_type: LockedPage

thinking_1:
  id: 3
  page_id: 2
  title: So I was thinking!!!
  version: 23
  version_type: SpecialLockedPage

thinking_2:
  id: 4
  page_id: 2
  title: So I was thinking
  version: 24
  version_type: SpecialLockedPage