From 9b68754ba5c1f63d7ca6adfee3ef6114628c175e Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Mon, 24 Sep 2007 19:08:26 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Conflicts:

	NEWS
---
(limited to 'configure.ac')

--
cgit v0.9.1