From abe8f5cc4fe704f505b7ec79dc0326a6647e0f47 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Mon, 12 Sep 2011 15:14:25 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:browse/mainline

---
(limited to 'AUTHORS')

--
cgit v0.9.1