Merge commit '59f2b98' into stable
authorJiri Slaby <jslaby@suse.cz>
Fri, 15 Feb 2013 14:56:20 +0000 (15:56 +0100)
committerJiri Slaby <jslaby@suse.cz>
Fri, 15 Feb 2013 14:56:20 +0000 (15:56 +0100)
commit2fa96bd51718a06667cf23f3a71fa20a4df068cb
tree045176127873684d9fd936ccea94d27abf823d4c
parentaeb27143cd2a8d0af09da35287f852f3a739f8b5
parent59f2b987a77106ef5cc367d231474ad2db4c52af
Merge commit '59f2b98' into stable