From e4e9b382499329a499459df0022108766426c2ac Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Tue, 25 Feb 2014 13:16:28 -0500
Subject: Merge branch 'feature/drop-libopkbuild-dep'.

Conflicts:
	configure
---
(limited to 'locale/en_US.sh')

--
cgit v0.9.1