Merge branch 'master' into develop

6 files changed, 9 insertions, 9 deletions

diff --git a/src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java b/src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java
index 46bbcc554..11e4a7803 100644
--- a/src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java
+++ b/src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java
@@ -26,8 +26,8 @@ import de.danoeh.antennapod.adapter.MiroGuideItemlistAdapter;
 import de.danoeh.antennapod.dialog.DownloadRequestErrorDialogCreator;
 import de.danoeh.antennapod.feed.Feed;
 import de.danoeh.antennapod.feed.FeedManager;
-import de.danoeh.antennapod.miroguide.con.MiroGuideException;
-import de.danoeh.antennapod.miroguide.con.MiroGuideService;
+import de.danoeh.antennapod.miroguide.conn.MiroGuideException;
+import de.danoeh.antennapod.miroguide.conn.MiroGuideService;
 import de.danoeh.antennapod.miroguide.model.MiroGuideChannel;
 import de.danoeh.antennapod.storage.DownloadRequestException;
 import de.danoeh.antennapod.storage.DownloadRequester;
diff --git a/src/de/danoeh/antennapod/activity/MiroGuideMainActivity.java b/src/de/danoeh/antennapod/activity/MiroGuideMainActivity.java
index aec0c6ea4..4d8c13491 100644
--- a/src/de/danoeh/antennapod/activity/MiroGuideMainActivity.java
+++ b/src/de/danoeh/antennapod/activity/MiroGuideMainActivity.java
@@ -16,8 +16,8 @@ import com.actionbarsherlock.view.MenuItem;
 
 import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.miroguide.con.MiroGuideException;
-import de.danoeh.antennapod.miroguide.con.MiroGuideService;
+import de.danoeh.antennapod.miroguide.conn.MiroGuideException;
+import de.danoeh.antennapod.miroguide.conn.MiroGuideService;
 
 /**
  * Shows a list of available categories and offers a search button. If the user
diff --git a/src/de/danoeh/antennapod/fragment/MiroGuideChannellistFragment.java b/src/de/danoeh/antennapod/fragment/MiroGuideChannellistFragment.java
index ac12cce3d..60546fdeb 100644
--- a/src/de/danoeh/antennapod/fragment/MiroGuideChannellistFragment.java
+++ b/src/de/danoeh/antennapod/fragment/MiroGuideChannellistFragment.java
@@ -23,8 +23,8 @@ import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MiroGuideChannelViewActivity;
 import de.danoeh.antennapod.adapter.MiroGuideChannelListAdapter;
-import de.danoeh.antennapod.miroguide.con.MiroGuideException;
-import de.danoeh.antennapod.miroguide.con.MiroGuideService;
+import de.danoeh.antennapod.miroguide.conn.MiroGuideException;
+import de.danoeh.antennapod.miroguide.conn.MiroGuideService;
 import de.danoeh.antennapod.miroguide.model.MiroGuideChannel;
 
 /**
diff --git a/src/de/danoeh/antennapod/miroguide/con/MiroGuideConnector.java b/src/de/danoeh/antennapod/miroguide/conn/MiroGuideConnector.java
index 6e789630d..4637c7725 100644
--- a/src/de/danoeh/antennapod/miroguide/con/MiroGuideConnector.java
+++ b/src/de/danoeh/antennapod/miroguide/conn/MiroGuideConnector.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.miroguide.con;
+package de.danoeh.antennapod.miroguide.conn;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/de/danoeh/antennapod/miroguide/con/MiroGuideException.java b/src/de/danoeh/antennapod/miroguide/conn/MiroGuideException.java
index 074fc3d3c..6097761d8 100644
--- a/src/de/danoeh/antennapod/miroguide/con/MiroGuideException.java
+++ b/src/de/danoeh/antennapod/miroguide/conn/MiroGuideException.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.miroguide.con;
+package de.danoeh.antennapod.miroguide.conn;
 
 public class MiroGuideException extends Exception {
 	private static final long serialVersionUID = -8834656185748713194L;
diff --git a/src/de/danoeh/antennapod/miroguide/con/MiroGuideService.java b/src/de/danoeh/antennapod/miroguide/conn/MiroGuideService.java
index 1013f466d..5cb137574 100644
--- a/src/de/danoeh/antennapod/miroguide/con/MiroGuideService.java
+++ b/src/de/danoeh/antennapod/miroguide/conn/MiroGuideService.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.miroguide.con;
+package de.danoeh.antennapod.miroguide.conn;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;