Merge branch 'master' into stable
authorJiri Slaby <jslaby@suse.cz>
Fri, 20 Sep 2013 19:16:43 +0000 (21:16 +0200)
committerJiri Slaby <jslaby@suse.cz>
Fri, 20 Sep 2013 19:16:43 +0000 (21:16 +0200)
commitfeffbf9bbb20fa91790c44f28025c68e14082817
treeb78d672590dfadb02c505d23fffe565aa43d5789
parent91820671cdfcf26804f9b44f16b2996f03918bcf
parent50dfbd054652d6340d62c68e7130bd6705e7b234
Merge branch 'master' into stable