sw to 3.1
Merge pull request #377 from xdel/2013-1-2-mash-for-testing

2013.1.2, let`s roll