Merge remote-tracking branch 'origin/master' into stable
authorJiri Slaby <jslaby@suse.cz>
Tue, 17 Sep 2013 08:21:25 +0000 (10:21 +0200)
committerJiri Slaby <jslaby@suse.cz>
Tue, 17 Sep 2013 08:21:25 +0000 (10:21 +0200)
commit76e317e0d16d62a44d846a5564ca5a788b202e26
treea56210ce36fa3d0f9b3fd0279e8610243c00369b
parentcee6127cc405219566729ed94ffc4cb64744a2cd
parentded2bc70ae7465f35a7124c70214b794d6020a9a
Merge remote-tracking branch 'origin/master' into stable