Merge branch 'master' into stable
authorJiri Slaby <jslaby@suse.cz>
Fri, 1 Mar 2013 13:02:38 +0000 (14:02 +0100)
committerJiri Slaby <jslaby@suse.cz>
Fri, 1 Mar 2013 13:02:38 +0000 (14:02 +0100)
commitfe5c73e505803da9abb952b352b6f34ab289211b
tree8c3a3584c71c28ee694575fdf8d9cd35d30283c7
parent01ba0a9dcb7dbf005ded74868e3d1b0f1f32c2b0
parentcdd289be07a0a335571bf29f53702c500af326a4
Merge branch 'master' into stable