[mate-text-editor/f17: 6/6] Merge branch 'f18' into f17

[Rex Dieter]

commit 05641fdd0f79cfeef9b166bc9a2d03ac68ad350d
Merge: 3b13d0e 4e24e5c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 18 13:28:56 2012 -0500

    Merge branch 'f18' into f17

 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---