Merge branch 'openSUSE-13.1' into stable
authorJiri Slaby <jslaby@suse.cz>
Wed, 2 Oct 2013 15:41:54 +0000 (17:41 +0200)
committerJiri Slaby <jslaby@suse.cz>
Wed, 2 Oct 2013 15:41:54 +0000 (17:41 +0200)
commitc3399a3511919906a04db20b27eb0f0f3067a678
treeccf9c0bdf2998e48ace14c9def750e2291292b97
parent47f1d032ecb546f62ee8a1e949fd6148bc3ecf4b
parenta7b497f795a2ab9adb3213a97fa07e8588333fb1
Merge branch 'openSUSE-13.1' into stable

suse-commit: b1e6ec5d0f47ca874fea4c9c02fc6aae7066d18d