-
Committer:
Tarmac
-
Author(s):
Michal Hruby, Alejandro J. Cura, CI bot, Rodney Dawes
-
Date:
2014-08-14 15:48:06 UTC
-
mfrom:
(396.1.1 merge-trunk)
-
Revision ID:
tarmac-20140814154806-s12eft9kdtq7xqmy
Merge changes from trunk.
Approved by Pawel Stolowski, PS Jenkins bot.