[octave/f21: 3/3] Merge branch 'master' into f21

[Orion Poplawski]

commit 9bfbb77baa21ae4620ead09f7379f9831100ef88
Merge: acb556b 087e847
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sun Feb 8 19:36:19 2015 -0700

    Merge branch 'master' into f21

 octave.spec |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
---