Merge remote-tracking branch 'origin/master' into 4_7_x
authormalfredo32 <alfredo@solucionesopen.com.mx>
Sat, 30 Aug 2014 18:03:19 +0000 (13:03 -0500)
committermalfredo32 <alfredo@solucionesopen.com.mx>
Sat, 30 Aug 2014 18:03:19 +0000 (13:03 -0500)

Trivial merge