]> gitweb.fluxo.info Git - policy.git/commitdiff
projects / policy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 892e2b3 a438ef5)
Merge branch 'master' of ssh://patron.pagekite.me/home/policy/policy
authormaxigas <maxigas@anargeek.net>
Thu, 11 Apr 2013 16:44:37 +0000 (18:44 +0200)
committermaxigas <maxigas@anargeek.net>
Thu, 11 Apr 2013 16:44:37 +0000 (18:44 +0200)
merging empty ikiwiki with the old one


Trivial merge
Providers Commitment for Privacy (PCP)