From: Nelson Ferreira <nelson.ferreira@ieee.org>
Date: Sat, 26 Sep 2015 15:41:17 +0000 (-0400)
Subject: Merge branch 'master' into for-steve
X-Git-Tag: v22.1.16~14^2~17
X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=e3d0801a12b2b6ddb4720aaf9d1952b1d823e89e;hp=14fb0b4ba1fdf3d6c6c63f7c22b50aa4f8187921;p=sxemacs

Merge branch 'master' into for-steve
---