[compiz/f18: 6/6] Merge branch 'master' into f18

[Wolfgang Ulbrich]

commit f16774df15c1bf0f0f11e40005ebeed86ba9317e
Merge: 341cd19 21a3f97
Author: raveit <chat-to-me at raveit.de>
Date:   Mon Jun 3 15:56:28 2013 +0200

    Merge branch 'master' into f18

 compiz-decorator-emerald  |   23 +++++++----------------
 compiz-decorator-gtk      |   29 +++++++++--------------------
 compiz.spec               |    5 ++++-
 emerald-decorator.desktop |    4 ++--
 gtk-decorator.desktop     |    4 ++--
 5 files changed, 24 insertions(+), 41 deletions(-)
---