Merge branch 'master' of http://p2p-next.cs.pub.ro/git/p2p-next/swifty
authorAdrian Bondrescu <adi.bondrescu@gmail.com>
Sun, 20 May 2012 16:51:51 +0000 (19:51 +0300)
committerAdrian Bondrescu <adi.bondrescu@gmail.com>
Sun, 20 May 2012 16:51:51 +0000 (19:51 +0300)

Trivial merge