• Merge remote-tracking branch 'origin/3909-logging' 

    Conflicts:
	configure-syslog.py
    Jim Nisbet Jim Nisbet
    Jim Nisbet authored and Jim Nisbet committed Sep 6, 2013
    0449624