Merge branch 'develop' into sso_bug_changing_orientation
authorDavid A. Velasco <dvelasco@solidgear.es>
Sat, 17 Aug 2013 08:52:03 +0000 (10:52 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Sat, 17 Aug 2013 08:52:03 +0000 (10:52 +0200)
commit54679a521d5126d586969c234e6f1536f27dae81
tree3d1c251d8c84fd0e9bf32f309f0762fc254f66d3
parentb458c92be0e4e02220316b997702d4dcad1af125
parent782a38646d29af0f9e66410f62a6428b950fd75a
Merge branch 'develop' into sso_bug_changing_orientation