# HG changeset patch
# User jasonwryan <jasonwryan@gmail.com>
# Date 1369086939 -43200
#      Tue May 21 09:55:39 2013 +1200
# Node ID f6dd5ee6a64b82c6f7da7d928a332ea327fa7c52
# Parent  3ab6dbb85ec9eab2795986e4acc9767645fbdd96
# Parent  804b2a32dba1a27d404e020c942316fb2180f564
Merged with Veles

diff --git a/series b/series
--- a/series
+++ b/series
@@ -3,7 +3,7 @@
 statuscolours
 cycle
 push
-fibonacci 
-shiv.config
+fibonacci #-block
+shiv.config #-block
 centurion.config #-block
-veles.config #-block
+veles.config