From b9f75c14727b30b9cd07b18c2c15f15d71201bb4 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Date: Sun, 05 Nov 2006 17:51:05 +0000
Subject: Merge branch 'master' of git://dev.laptop.org/sugar

---
(limited to '.gitignore')

--
cgit v0.9.1