[0ad/f21: 3/3] fix merge

[Peter Robinson]

commit 9147231b427b9955317d41a483f6e657009e0388
Merge: 571282a 404b1bb
Author: Peter Robinson <pbrobinson at fedoraproject.org>
Date:   Fri Aug 15 18:09:17 2014 +0000

    fix merge

 0ad.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---