Merge branch 'master' into stable
authorJiri Slaby <jslaby@suse.cz>
Thu, 28 Feb 2013 15:59:30 +0000 (16:59 +0100)
committerJiri Slaby <jslaby@suse.cz>
Thu, 28 Feb 2013 15:59:30 +0000 (16:59 +0100)
commit01ba0a9dcb7dbf005ded74868e3d1b0f1f32c2b0
tree75db99016d10da99bdff59d46a83546780030d71
parentcbfcdf7410d471089cce57c23e892444feca1376
parent0c01cacf7e6b12c890e6df80b1a3229ca2b4ec2b
Merge branch 'master' into stable