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

[Rex Dieter]

commit fecc157224f9f5f415975021aaf375e3d16ce084
Merge: 99bdba9 c4771f9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 18 13:30:37 2012 -0500

    Merge branch 'f18' into f17

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