wordpress 3.6
Merge branch 'master' of https://github.com/beetleskin/peernet