Merge branch 'dev'

<!--

#

# Licensed to the Apache Software Foundation (ASF) under one

# or more contributor license agreements.  See the NOTICE file

# distributed with this work for additional information

# regarding copyright ownership.  The ASF licenses this file

# to you under the Apache License, Version 2.0 (the

# "License"); you may not use this file except in compliance

# with the License.  You may obtain a copy of the License at

# 

# http://www.apache.org/licenses/LICENSE-2.0

# 

# Unless required by applicable law or agreed to in writing,

# software distributed under the License is distributed on an

# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

#  KIND, either express or implied.  See the License for the

# specific language governing permissions and limitations

# under the License.

#

-->

# Release Notes

### 0.2.1 (Sept 5, 2013)

* CB-4432 copyright notice change

<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"

xmlns:android="http://schemas.android.com/apk/res/android"

id="org.apache.cordova.core.AudioHandler"

    version="0.2.0">

    version="0.2.1">

    <name>Media</name>

    <description>Cordova Media Plugin</description>

    <license>Apache 2.0</license>