Merge branch 'buffered-output-stream-flush' of git://github.com/andrewgaul/AntennaPod into andrewgaul-buffered-output-stream-flush

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch andrewgaul-buffered-output-stream-flush
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   src/de/danoeh/antennapod/service/download/HttpDownloader.java
#	modified:   tests/src/de/danoeh/antennapod/test/FeedHandlerTest.java
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#   (commit or discard the untracked or modified content in submodules)
#
#	modified:   submodules/ActionBarSherlock (modified content, untracked content)
#	modified:   submodules/ViewPagerIndicator (modified content, untracked content)
#	modified:   submodules/dslv (modified content, untracked content)
#

0 files changed, 0 insertions, 0 deletions