Merge remote-tracking branch 'origin/master' into stable
authorJiri Slaby <jslaby@suse.cz>
Tue, 12 Mar 2013 21:45:30 +0000 (22:45 +0100)
committerJiri Slaby <jslaby@suse.cz>
Tue, 12 Mar 2013 21:45:30 +0000 (22:45 +0100)
commitf3f64cb4786fd567eb9005e2565ad8d000c0c138
tree99ebca72c13a335f6240771e829acdf1c99dee3c
parente30e8ce24ca0942dce1bd02ca89b9db38df1381c
parent6b249cb8c19a26e52aa53813bee76d3ea3191828
Merge remote-tracking branch 'origin/master' into stable