From 3c083cef1b6837eba21987882671c19b39b1476d Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Sun, 31 Mar 2013 18:03:51 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:infoslicer/mainline

---
--
cgit v0.9.1