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)
commitb1e6ec5d0f47ca874fea4c9c02fc6aae7066d18d
tree96b703062f39163c1a4810011defdce3de3926c3
parent4c1fc5ab7e91b09a2e0e6e29471ff7a5c1d58312
parent485f0d128ebc47c0d72393c99edb2b304f7cf487
Merge branch 'openSUSE-13.1' into stable