[criu/f20: 3/3] Merge branch 'master' into f20

Fri Feb 28 16:30:16 UTC 2014

commit 5fd945ee9f19ed7254b229378985e617d9a3e02b
Merge: fdad8cd f7ff4ab
Author: Adrian Reber <adrian at lisas.de>
Date:   Fri Feb 28 17:30:52 2014 +0100

    Merge branch 'master' into f20

 .gitignore                                         |    1 +
 ...x-libcriu.so-links-and-man-page-installat.patch |   49 -----------
 48b22f0d9578561660ae67c0cfdd66040362c9cf           |   54 -------------
 b0e6ebc1c7a529dfc3073c26f2a18733a1088458           |   84 --------------------
 criu.spec                                          |   25 ++----
 f5f9fb9c0007a613273064626b87ad62ad4b5923           |   40 ---------
 ptrace_peeksiginfo_args.patch                      |   26 ------
 sources                                            |    2 +-
 8 files changed, 11 insertions(+), 270 deletions(-)
---