Merge branch 'master' into stable
authorJiri Slaby <jslaby@suse.cz>
Fri, 29 Nov 2013 22:29:33 +0000 (23:29 +0100)
committerJiri Slaby <jslaby@suse.cz>
Fri, 29 Nov 2013 22:29:33 +0000 (23:29 +0100)
commitd85f6ec3a3b04ae22b9d40107c923c64d8f6706c
tree2fc0cc2a4e08357f21ebdb264f7c8c2ce01f0108
parent999c17acbe5fee2762d09ebebf174237382629b5
parent3b81e610d31696c8876236b2019d953750fb4de5
Merge branch 'master' into stable