Change-Id: I2d4c6a386f7072fa2e21b366126c53258f4c739d
Signed-off-by: kathCLM <ktrin.chris@gmail.com>


Change-Id: I47bc0731ffdf5f8711b7468469abbd847c8aefb9
Signed-off-by: kathCLM <ktrin.chris@gmail.com>
asdasdasdasd

Change-Id: I7ea2a218ca87998d7f3f28bf88e63f432019a71d
Signed-off-by: lennin92 <lennin92@gmail.com>


Change-Id: Ia4dd6d6cb4e5f708afa1fe23b51c90b757df0d25
Signed-off-by: lennin92 <lennin92@gmail.com>


Change-Id: I522fdf1e94d415d07c591b879143279a59e2540d
Signed-off-by: lennin92 <lennin92@gmail.com>


Change-Id: If9abd0b3c0fc1435a67d4fb51dfc3b292cee139d
Signed-off-by: lennin92 <lennin92@gmail.com>


Change-Id: I12ebb39655f5e50d5b8f3492159bf1dfcf110688
Signed-off-by: kathCLM <ktrin.chris@gmail.com>


Change-Id: I12ebb39655f5e50d5b8f3492159bf1dfcf110688
Signed-off-by: kathCLM <ktrin.chris@gmail.com>
Signed-off-by: lennin92 <lennin92@gmail.com>


Change-Id: Ide42194e0b60451058b0440b589f3769dcb52e8f
Signed-off-by: kathCLM <ktrin.chris@gmail.com>


Change-Id: I0a240f029a35a6ff16e19f4fc7a77f982ae0f374
Signed-off-by: kathCLM <ktrin.chris@gmail.com>


Change-Id: If5018718f62b2fc35b1e5362d2a510199e78821f
Signed-off-by: kathCLM <ktrin.chris@gmail.com>


Change-Id: I3254fcae389dd762b756b12c628a80c2b7742afc
Signed-off-by: kathCLM <ktrin.chris@gmail.com>


Change-Id: I128d5404b49a6336e25267dab3bfd64e9665bb4d
Signed-off-by: kathCLM <ktrin.chris@gmail.com>


Change-Id: If5012b41ead1bf2c10512418c5942b8a67e80792
Signed-off-by: kathCLM <ktrin.chris@gmail.com>


Change-Id: Ie6cc712da56a0bbe006e5e6b55a6cc7bdb8fa2db
Signed-off-by: kathCLM <ktrin.chris@gmail.com>


Change-Id: I19e029d84080c01ad29facf11ffe429af39a82a9
Signed-off-by: kathCLM <ktrin.chris@gmail.com>
Merge branch 'kath' of git@github.com:lennin92/AGEPYM_MAESTRO.git into
kath

Conflicts:
	agepym_maestro/Entidades/Beneficiario.py


Change-Id: I169ee769a8e44113dcfa152dd98e4ebb1ef5e28b
Signed-off-by: lennin92 <lennin92@gmail.com>


Change-Id: I03cbbfbd9ecde7ee8b4763393692330fdae84932
Signed-off-by: lennin92 <lennin92@gmail.com>
Merge branch 'kath'

Conflicts:
	agepym_maestro/ModuloPlanes/GPAF.py
	agepym_maestro/Ventanas/GBeneficiariosWindow.py

Change-Id: I7efa8d82982123dce919058a112fa4d95b91c394
Signed-off-by: PALMA <PALMA@10.10.201.197>