Merge change up to right before new-year copyright bumping
authorIan Beckwith <ianb@erislabs.net>
Sun, 2 Feb 2014 20:48:41 +0000 (20:48 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sun, 2 Feb 2014 20:48:41 +0000 (20:48 +0000)
commitd93e239a6a447bb45b77121739015760aad15584
treeda4b441ce069397b6664f3df045beed575da963b
parent35170063f45ccb74210505c198c8c0ab5c532be0
parentbeae0bdcf7fe30f2415c16f6b8c1368d469e519c
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
gnulib-tool