sw to 3.1
Merge pull request #401 from aglarendil/develop

Revert "Merge pull request #399 from Zipfer/floating_ip"
Merge pull request #377 from xdel/2013-1-2-mash-for-testing

2013.1.2, let`s roll
Revert "sw to 3.1" because of incomplete deps

This reverts commit a426ec1600f60ea0cee40cebecb3221ddc09533d.
Merge pull request #406 from xdel/develop

Revert "sw to 3.1" because of incomplete deps