From kde-commits  Sat Jan 02 18:42:44 2016
From: Johannes Obermayr <johannesobermayr () gmx ! de>
Date: Sat, 02 Jan 2016 18:42:44 +0000
To: kde-commits
Subject: [k3b/kf5] src: Merge remote-tracking branch 'origin/master' into kf5
Message-Id: <E1aFR8W-00041D-CI () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=145176017716520

Git commit 0f9a3dad8a001bae0c7c6293b84a7c88c6cabf32 by Johannes Obermayr.
Committed on 02/01/2016 at 18:41.
Pushed by jobermayr into branch 'kf5'.

Merge remote-tracking branch 'origin/master' into kf5

M  +1    -1    src/k3bthememanager.cpp
M  +1    -1    src/option/k3badvancedoptiontab.cpp

http://commits.kde.org/k3b/0f9a3dad8a001bae0c7c6293b84a7c88c6cabf32