Merge branch 'master' into stable
authorJiri Slaby <jslaby@suse.cz>
Mon, 4 Mar 2013 09:22:37 +0000 (10:22 +0100)
committerJiri Slaby <jslaby@suse.cz>
Mon, 4 Mar 2013 09:22:37 +0000 (10:22 +0100)
commit9871030a05e5415374c2b1fd3b0b8449ac2da1a9
tree150395ae022741fa915786bce781922ccb66c908
parentfe5c73e505803da9abb952b352b6f34ab289211b
parent3611cf6d43d1db8e15ed6a44ba60ac4a65c14c2a
Merge branch 'master' into stable