Merge branch 'v0.1'

2013-02-07 12:13:24 +01:00 · 2013-02-07 12:13:24 +01:00 · 2492a07705
commit 2492a07705
parent 1bdbf1af93 05c3312a77
2 changed files with 5 additions and 1 deletions
--- a/composer.json
+++ b/composer.json
@ -33,5 +33,10 @@
        "psr-0": {
            "FFMpeg": "src"
        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "0.1.x-dev"
+        }
    }
 }