Signed-off-by: Nixy <kpoleg2@gmail.com>
Signed-off-by: Grinch <artem@zappylab.com>
Signed-off-by: Nixy <kpoleg2@gmail.com>
Merge branch 'master' of git@bitbucket.org:ComfyMobile/saadat.git

Conflicts:
	src/com/comfymobile/saadat/activity/ListActivity.java
Signed-off-by: Nixy <kpoleg2@gmail.com>
Signed-off-by: Nixy <kpoleg2@gmail.com>
Signed-off-by: Nixy <kpoleg2@gmail.com>
Signed-off-by: Nixy <kpoleg2@gmail.com>
Signed-off-by: Grinch <artem@zappylab.com>
Signed-off-by: Nixy <kpoleg2@gmail.com>
Signed-off-by: Nixy <kpoleg2@gmail.com>
Signed-off-by: Nixy <kpoleg2@gmail.com>
Signed-off-by: Grinch <artem@zappylab.com>
Signed-off-by: Grinch <artem@zappylab.com>
Signed-off-by: Grinch <artem@zappylab.com>
Signed-off-by: Nixy <kpoleg2@gmail.com>
Merge branch 'master' of git@bitbucket.org:ComfyMobile/saadat.git

Conflicts:
	src/com/comfymobile/saadat/adapter/RSSReader.java
Signed-off-by: Nixy <kpoleg2@gmail.com>
Signed-off-by: Grinch <artem@zappylab.com>
Merge branch 'master' of git@bitbucket.org:ComfyMobile/saadat.git