Merge branch 'release' into upstream

Conflicts:
	main/src/cgeo/geocaching/MainActivity.java

1 files changed, 1 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index 4927b10..38d9127 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -54,7 +54,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -551,7 +550,7 @@ public class MainActivity extends AbstractActivity {
                                     observer.onNext(formatAddress(addresses.get(0)));
                                 }
                                 observer.onCompleted();
-                            } catch (final IOException e) {
+                            } catch (final Exception e) {
                                 observer.onError(e);
                             }
                             return Subscriptions.empty();