From df3069a9317fc804b62bd3624d9591fb2e09df0f Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 07 Aug 2007 12:43:27 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

---
(limited to 'Makefile.am')

--
cgit v0.9.1