Merge branch 'hmq'

imageLoader/.classpath.rej

+diff a/imageLoader/.classpath b/imageLoader/.classpath	(rejected hunks)
+@@ -1,8 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<classpath>
+-	<classpathentry kind="src" path="src"/>
+-	<classpathentry kind="src" path="gen"/>
+-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+-	<classpathentry kind="output" path="bin/classes"/>
+-</classpath>

imageLoader/src/com/nostra13/universalimageloader/cache/disc/DiskCache.java

@@ -26,10 +26,7 @@ import java.io.InputStream;
  * Interface for disk cache
  * Interface for disk cache
  *
  *
  * @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
  * @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
-<<<<<<< HEAD
- * @since 1.9.1
-=======
- * @since 1.8.2
+ * @since 1.8.2sadfasdfa
 >>>>>>> 60c2ed3dd69f390d535e0e9eefcf05fcfbf21102
 >>>>>>> 60c2ed3dd69f390d535e0e9eefcf05fcfbf21102
  */
  */
 public interface DiskCache {
 public interface DiskCache {