Merge branch 'master' into f17 so they have the same history.

2012-05-23 08:21:51 +02:00 · 2012-05-23 08:21:51 +02:00 · 853e237741
commit 853e237741
parent a7c268d276 e804b595ba
2 changed files with 5 additions and 2 deletions
--- a/numad.spec
+++ b/numad.spec
@ -2,7 +2,7 @@

 Name: numad
 Version: 0.5
-Release: 3.20120221git%{?dist}
+Release: 4.20120522git%{?dist}
 Summary: NUMA user daemon

 License: LGPLv2
@ -74,6 +74,9 @@ if [ $1 -eq 0 ]; then
 fi

 %changelog
+* Wed May 23 2012 Jan Synáček <jsynacek@redhat.com> - 0.5-4.20120522git
+- update source (20120522) and manpage
+
 * Tue Mar 06 2012 Jan Synáček <jsynacek@redhat.com> 0.5-3.20120221git
 - update source
 - drop the patch
--- a/2
+++ b/2
@ -1 +1 @@
-32203166a88ed40a825c22dffbc19868  numad-0.5git.tar.xz
+15e323077951ca49bf799f702824b0fb  numad-0.5git.tar.xz