[criu/f19: 7/7] Merge branch 'master' into f19

[Adrian Reber]

commit bee41e6561a4d0140503580ed17095b7d1fa07bb
Merge: df5b6a5 cffc4d2
Author: Adrian Reber <adrian at lisas.de>
Date:   Tue Sep 23 12:33:33 2014 +0200

    Merge branch 'master' into f19

 .gitignore                                        |    2 +
 0001-log-Include-inttypes.h-for-PRI-helpers.patch |   30 +++++++++++++++++++++
 criu.spec                                         |   23 +++++++++++++++-
 sources                                           |    2 +-
 4 files changed, 55 insertions(+), 2 deletions(-)
---