Merge remote-tracking branch 'origin/develop' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 6 Aug 2013 10:17:52 +0000 (12:17 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 6 Aug 2013 10:17:52 +0000 (12:17 +0200)
commit1f02143d9997dcfa66f8b3f93378c3e1877cb498
treeb66e6dabe1272d75870bf1e63fdcdc4416306df0
parent3420444dffdc6d2cf1d42ed60809d705e6bc4212
parent01cc23802f9dff9637fa0d148fc68c28c2e3f185
Merge remote-tracking branch 'origin/develop' into develop