From: Ian Beckwith <ianb@erislabs.net>
Date: Sun, 2 Feb 2014 20:48:41 +0000 (+0000)
Subject: Merge change up to right before new-year copyright bumping
X-Git-Tag: debian/20140202+stable-1~11
X-Git-Url: http://erislabs.net/gitweb/?p=gnulib.git;a=commitdiff_plain;h=d93e239a6a447bb45b77121739015760aad15584

Merge change up to right before new-year copyright bumping

Merge commit 'beae0bdcf7fe30f2415c16f6b8c1368d469e519c'

Conflicts:
	ChangeLog
	build-aux/config.guess
	doc/maintain.texi
	doc/standards.texi
---

d93e239a6a447bb45b77121739015760aad15584