From fb09fdb625dde0e90c46a5a19aa8d245b377f6e6 Mon Sep 17 00:00:00 2001
From: Manuel Quiñones <manuq@laptop.org>
Date: Mon, 30 Apr 2012 11:39:19 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:browse/mainline

---
(limited to 'COPYING')

--
cgit v0.9.1