commit d296062b0a63b873fcfd85a605a7b923bc50ed51 Merge: e33872f 92367a0 Author: Pierre-Yves Chibon <pingou at pingoured.fr> Date: Sat Sep 7 11:15:12 2013 +0200 Merge branch 'el6' into el5 .gitignore | 1 + packagedb-cli.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) ---