From kde-commits  Sat Dec 18 11:13:17 2010
From: Hugo Pereira Da Costa <hugo () oxygen-icons ! org>
Date: Sat, 18 Dec 2010 11:13:17 +0000
To: kde-commits
Subject: [Oxygen-Gtk] f0829c5: Merge branch 'windowmanager'
Message-Id: <20101218111317.3B5AAA6092 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129267084102177

commit f0829c5b2b327dc12e432230ab0af9bc8a5bc273
branch master
Merge: 6b86af2 8317c73
Author: Hugo Pereira Da Costa <hugo@oxygen-icons.org>
Date:   Sat Dec 18 12:13:10 2010 +0100

    Merge branch 'windowmanager'