Merge branch 'master' into cdvtest cdvtest
authorMichal Mocny <mmocny@gmail.com>
Mon, 5 May 2014 16:12:42 +0000 (12:12 -0400)
committerMichal Mocny <mmocny@gmail.com>
Mon, 5 May 2014 16:12:42 +0000 (12:12 -0400)
commit3a0ddee985dc57e9088b7844bffbf02688d418ef
treeada6c2d03677b2fc3f4ddfc797cf87131d292bfd
parentb3ab710e691644d4b05a061bf9d4d7784c21ecaf
parent1ac2200942713695154b131ec8087cc18603c789
Merge branch 'master' into cdvtest

Conflicts:
test/manual.html
plugin.xml