From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 1 Dec 2014 11:16:42 +0100
Subject: [Buildroot] [git commit] Merge branch 'next'
Message-ID: <20141201104839.D5E937FC49@busybox.osuosl.org>
List-Id: <buildroot.busybox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: buildroot@busybox.net

commit: http://git.buildroot.net/buildroot/commit/?id=fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Conflicts:
	Makefile
	package/flac/0001-fix-altivec-logic.patch
	package/grantlee/Config.in

Patch is too large, so refusing to show it
Patch is too large, so refusing to show it