diff .svn/pristine/97/973b70a6f80d512da5b93ab8edd1a07f8588fefd.svn-base @ 935:fe0249c097f6 live

Merge from the default branch
author Chris Cannam
date Wed, 11 Jul 2012 13:33:14 +0100
parents cbb26bc654de
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/97/973b70a6f80d512da5b93ab8edd1a07f8588fefd.svn-base	Wed Jul 11 13:33:14 2012 +0100
@@ -0,0 +1,13 @@
+--- 
+tokens_001: 
+  created_on: 2007-01-21 00:39:12 +01:00
+  action: register
+  id: 1
+  value: DwMJ2yIxBNeAk26znMYzYmz5dAiIina0GFrPnGTM
+  user_id: 1
+tokens_002: 
+  created_on: 2007-01-21 00:39:52 +01:00
+  action: recovery
+  id: 2
+  value: sahYSIaoYrsZUef86sTHrLISdznW6ApF36h5WSnm
+  user_id: 2