From: maxigas <maxigas@anargeek.net>
Date: Thu, 11 Apr 2013 16:44:37 +0000 (+0200)
Subject: Merge branch 'master' of ssh://patron.pagekite.me/home/policy/policy
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=cfa8b7f0bb7e52e6b6611f82b91560a7cb26767a;p=policy.git

Merge branch 'master' of ssh://patron.pagekite.me/home/policy/policy

merging empty ikiwiki with the old one
---

cfa8b7f0bb7e52e6b6611f82b91560a7cb26767a