From 76ea8d559af9fe3d3ef005c7b5a46b7e5bf37cee Mon Sep 17 00:00:00 2001
From: Gustavo Cruz <gustavo.cruz@colosa.com>
Date: Fri, 30 Nov 2012 12:19:32 -0400
Subject: [PATCH] Merge branch 'pm_wysiwyg', remote-tracking branch 'origin'
 into pm_wysiwyg