Janik Kleinhoff 71b420a1a5 Merge branch 'ping-if-feature'
This appears to have been sufficiently reviewed and doesn't seem to have
any critical flaws remaining; multiple other people agreed with merging.
2015-02-21 23:17:19 +00:00
..
2015-02-21 23:17:19 +00:00