[apcupsd/epel7: 5/5] Merge from master

[Orion Poplawski]

commit 8700d062be660a26604130f77bbd054e3544c438
Merge: 9cd23e9 f4fd99b
Author: Orion Poplawski <orion at nwra.com>
Date:   Wed Jan 22 15:01:15 2014 -0700

    Merge from master

 apcupsd-aarch64.patch | 3083 +++++++++++++++++++++++++++++++++++++++++++++++++
 apcupsd.spec          |   17 +-
 2 files changed, 3097 insertions(+), 3 deletions(-)
---