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)

Trivial merge