From a1b7adf83167a94d606c635c261b584967880d0b Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Sat, 18 Aug 2012 07:43:46 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:sugar-build/sugar-build

Conflicts:
	Makefile
	scripts/sugar.modules
---
(limited to 'docs')

--
cgit v0.9.1