From 131c791f15992ecaf6960ba8d90e0e106468fa5e Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Mon, 03 Sep 2007 14:28:45 +0000 Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity Conflicts: NEWS --- (limited to 'po') -- cgit v0.9.1