Merge branch 'master' into stable
authorJiri Slaby <jslaby@suse.cz>
Tue, 17 Sep 2013 17:55:40 +0000 (19:55 +0200)
committerJiri Slaby <jslaby@suse.cz>
Tue, 17 Sep 2013 17:55:40 +0000 (19:55 +0200)
commit91820671cdfcf26804f9b44f16b2996f03918bcf
treee8127518f9da1871ddcf0b0580fdb499353f222c
parent990059fabbb5a33a82738e370eca3414abc79159
parent5a7a093e237f3649082fe206dca88f3a90fcf4c4
Merge branch 'master' into stable