From: Christoph Hellwig <hch@lst.de>
Date: Wed, 6 May 2009 19:30:58 +0000 (+0200)
Subject: Merge branch 'master' of git://oss.sgi.com/xfs/cmds/xfsprogs
X-Git-Tag: v3.0.3~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35a170050c215790f4925bb579af0f26a382a89f;p=thirdparty%2Fxfsprogs-dev.git

Merge branch 'master' of git://oss.sgi.com/xfs/cmds/xfsprogs

Fix up CHANGES mismerge due to the 3.0.1 vs 3.0.2 schism.

Conflicts:
	doc/CHANGES
---

35a170050c215790f4925bb579af0f26a382a89f
diff --cc doc/CHANGES
index 82fd3be52,ab894a011..d718dd458
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@@ -1,8 -1,4 +1,8 @@@
 +xfsprogs-3.0.2 (6 May 2009)
 +	- Updates to Debian build process after recent autoconf tweaks.
 +	- Fix a couple of minor man page syntax issues.
 +
- xfsprogs-3.0.1 (16 April 2009)
+ xfsprogs-3.0.1 (4 May 2009)
  	- Update the Makepkgs script to generate proper source tarballs.
  	- New project(5) and projid(5) man pages.
  	- Fix extent array reallocation in the xfs_io bmap command,