[gazebo/f20: 2/2] Merge branch 'master' into f20

[rmattes]

commit 209f173bb7252ec7b6c37c6926c9a6d81ba00d32
Merge: 6830045 3763788
Author: Rich Mattes <richmattes at gmail.com>
Date:   Mon Oct 20 18:58:34 2014 -0400

    Merge branch 'master' into f20

 gazebo.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---