Merge branch 'master' of github.com:diasporg/Poduptime

README

-[![Build Status](https://secure.travis-ci.org/diasporg/Poduptime.png)](http://travis-ci.org/diasporg/Poduptime)
-Source for http://podupti.me
-
-    Poduptime is software to get live stats and data on listed Diaspora Pods.
-    Copyright (C) 2011 David Morley
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
\ No newline at end of file

README.md

+Poduptime             [![Build Status](https://secure.travis-ci.org/diasporg/Poduptime.png)](http://travis-ci.org/diasporg/Poduptime)
+============================
+
+Source for http://podupti.me
+
+  Poduptime is software to get live stats and data on listed Diaspora Pods.
+  Copyright (C) 2011 David Morley
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as
+  published by the Free Software Foundation, either version 3 of the
+  License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.