Merge branch 'master' into stable
authorJiri Slaby <jslaby@suse.cz>
Sun, 12 May 2013 14:53:56 +0000 (16:53 +0200)
committerJiri Slaby <jslaby@suse.cz>
Sun, 12 May 2013 14:53:56 +0000 (16:53 +0200)
commit04040b909bdbbda186c904905471db4c31307c3d
treec45b3b719aee78540a90cbb5cba534c0a58b116f
parentb6484b6fb03f74e16df9c442538197be9232624e
parentfa1ab6bd08dfbacdcad6e87354434ecb3fd09228
Merge branch 'master' into stable