[python-pyrad/el6: 13/13] Merge branch 'master' into el6
Peter Lemenkov
peter at fedoraproject.org
Thu Sep 5 11:56:11 UTC 2013
commit 4f6d42e1394352de31916908d30b873358efed9d
Merge: b2af476 1696c7f
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu Sep 5 15:55:51 2013 +0400
Merge branch 'master' into el6
Conflicts:
.gitignore
...-pyrad-0001-Use-a-better-random-generator.patch | 66 +++++++++++++++
python-pyrad.spec | 89 ++++++++++++--------
sources | 2 +-
3 files changed, 121 insertions(+), 36 deletions(-)
---
More information about the scm-commits
mailing list