caorongjin/liferay-portal — pull request #132 by juangon (2013-10-22 10:29:15+00:00)
Title: LPS-39361 import previews

Alex,

hope everything is ok.

Don't know why you had conflicts, I could merge with master without any problem.