From 4739976d0a96eb21b8f606c69ecc09ca7a1557de Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Tue, 08 Nov 2011 00:12:29 +0000
Subject: Merge commit 'refs/merge-requests/3' of git://git.sugarlabs.org/turtleart/mainline into integration

Conflicts:
	NEWS
	activity/activity.info
---
(limited to 'po')

--
cgit v0.9.1