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)
commit8d41bba151cb25cf6b4d26b61a5841c46cfe26bd
tree7b2ca43f3cb6d81a7faf714967f4fae1aef8178e
parent1929268e1fc03065c9fa3b545d3c46f8b55eb50f
parentb202a9512c4ef74a8863a9281bdb32fdc8b760ad
Merge remote-tracking branch 'origin/master' into 4_7_x