commit 89ee2c0143b2347f29fff7f0f12f26067f305c13
Merge: 21c538b 4531573
Author: Paul Wouters <pwouters at redhat.com>
Date: Fri Jan 2 14:56:14 2015 -0500
Merge branch 'master' into f20
.gitignore | 1 +
libotr.spec | 22 +++++++++++-----------
sources | 2 +-
3 files changed, 13 insertions(+), 12 deletions(-)
---