Merge branch 'master' of http://git.sxemacs.org/sxemacs into for-steve
authorNelson Ferreira <nelson.ferreira@ieee.org>
Sat, 14 Jan 2012 01:01:20 +0000 (20:01 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Sat, 14 Jan 2012 01:01:20 +0000 (20:01 -0500)
commitfb7a6f6a5451c8bf885bbff5a01a863e31cca0e9
treeb58e533fc916c1e6b269ecb7fdf3b79827990a31
parent5b049304111136c249b6f95e3d07b4eb526d0621
parentced0d054f625fd36f668cba565006b1aa7d721b5
Merge branch 'master' of git.sxemacs.org/sxemacs into for-steve