Merge branch 'develop' into sni_support_based_on_network_implementation_built_in
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 2 Dec 2013 12:44:08 +0000 (13:44 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 2 Dec 2013 12:44:08 +0000 (13:44 +0100)

Trivial merge