Merge branch 'openSUSE-13.1' into stable
authorJiri Slaby <jslaby@suse.cz>
Sun, 6 Oct 2013 19:44:18 +0000 (21:44 +0200)
committerJiri Slaby <jslaby@suse.cz>
Sun, 6 Oct 2013 19:44:18 +0000 (21:44 +0200)
commit042c43445688dac600f37d16f82281befc858648
treeca7377a0f9ad59bdc5999a27f2ab0df24e0ea5bc
parentb1e6ec5d0f47ca874fea4c9c02fc6aae7066d18d
parent40d7ca38f6ee07fea9d39c141621a0c247911daf
Merge branch 'openSUSE-13.1' into stable