From 0929e4265ee60b0a6eb45f4ff896f284a0bf1a5f Mon Sep 17 00:00:00 2001
From: Mort Yao <mort.yao@gmail.com>
Date: Thu, 14 Mar 2013 23:17:34 +0100
Subject: [PATCH] version 0.3.5

---
 CHANGELOG.txt          | 7 +++++++
 README.md              | 4 ++--
 README.txt             | 4 ++--
 src/you_get/version.py | 4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c24dc70e..3bc1adff 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+0.3.5
+-----
+
+*Date: 2013-03-15*
+
+* Default to use FFmpeg for merging .flv files.
+
 0.3.4
 -----
 
diff --git a/README.md b/README.md
index daf6c43c..0daf0038 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
 # You-Get
 
+[![Build Status](https://api.travis-ci.org/soimort/you-get.png)](https://travis-ci.org/soimort/you-get)
+
 [You-Get](https://github.com/soimort/you-get) is a video downloader runs on Python 3. It aims at easing the download of videos on [YouTube](http://www.youtube.com), [Youku](http://www.youku.com)/[Tudou](http://www.tudou.com) (biggest online video providers in China), [ Niconico](http://www.nicovideo.jp), etc., in one script.
 
 See the project homepage <http://www.soimort.org/you-get> for further documentation.
 
 Fork me on GitHub: <https://github.com/soimort/you-get>
 
-[![Build Status](https://api.travis-ci.org/soimort/you-get.png)](https://travis-ci.org/soimort/you-get)
-
 ## Features
 
 ### Supported Sites (As of Now)
diff --git a/README.txt b/README.txt
index c982c58c..9b39133e 100644
--- a/README.txt
+++ b/README.txt
@@ -1,14 +1,14 @@
 You-Get
 =======
 
+.. image:: https://api.travis-ci.org/soimort/you-get.png
+
 `You-Get <https://github.com/soimort/you-get>`_ is a video downloader runs on Python 3. It aims at easing the download of videos on `YouTube <http://www.youtube.com>`_, `Youku <http://www.youku.com>`_/`Tudou <http://www.tudou.com>`_ (biggest online video providers in China), `Niconico <http://www.nicovideo.jp>`_, etc., in one script.
 
 See the project homepage http://www.soimort.org/you-get for further documentation.
 
 Fork me on GitHub: https://github.com/soimort/you-get
 
-.. image:: https://api.travis-ci.org/soimort/you-get.png
-
 Features
 --------
 
diff --git a/src/you_get/version.py b/src/you_get/version.py
index 94421e3d..0bef1d10 100644
--- a/src/you_get/version.py
+++ b/src/you_get/version.py
@@ -2,5 +2,5 @@
 
 __all__ = ['__version__', '__date__']
 
-__version__ = '0.3.4'
-__date__ = '2013-03-08'
+__version__ = '0.3.5'
+__date__ = '2013-03-15'