QADM/SCG — pull request #286 by miguelcanm (2013-10-31 17:57:41+00:00)
Title: Merge resuelto

Se resuelve el Merge