Merge branch 'master' into stable
authorJiri Slaby <jslaby@suse.cz>
Tue, 12 Mar 2013 13:52:10 +0000 (14:52 +0100)
committerJiri Slaby <jslaby@suse.cz>
Tue, 12 Mar 2013 13:52:10 +0000 (14:52 +0100)
commite30e8ce24ca0942dce1bd02ca89b9db38df1381c
tree239da27242992e13da1be5c358ddf21e68e87d55
parent9871030a05e5415374c2b1fd3b0b8449ac2da1a9
parent48a333b5a6db234e17a8a8debb4155791067046c
Merge branch 'master' into stable