aboutsummaryrefslogtreecommitdiffstats
path: root/man/en
diff options
context:
space:
mode:
authorBryn M. Reeves <bmr@redhat.com>2013-04-04 17:06:13 +0100
committerBryn M. Reeves <bmr@redhat.com>2013-04-04 17:06:13 +0100
commit76156e8b7a8b7a31e30038819d0aa0d7ca5de197 (patch)
tree659ad2530a24db86f770ea601469f1d2bf6241e7 /man/en
parenta567c0a6fb7b6956e5f62cca9421f6b52bab8a39 (diff)
parent29e180fbc291686ee991952005c84c4b0d216a86 (diff)
downloadsos-76156e8b7a8b7a31e30038819d0aa0d7ca5de197.tar.gz
Merge branch 'bmr-pep8ify-names'
Conflicts: sos/plugins/general.py sos/plugins/juju.py
Diffstat (limited to 'man/en')
0 files changed, 0 insertions, 0 deletions