From c21801f97193ce25ab0079876bf8fe38f2b71afc Mon Sep 17 00:00:00 2001
From: Vladimir Diaz <vladimir.v.diaz@gmail.com>
Date: Tue, 11 Mar 2014 07:24:37 -0400
Subject: [PATCH] Merge branch 'develop', remote-tracking branch 'origin' into
 develop