Merge branch 'master' into development, to avoid clashes when removing

unused .bzrignore file.
This commit is contained in:
José Carlos Cuevas 2014-07-13 19:26:53 +02:00
commit 601d8ba1b8

View file

@ -1,2 +0,0 @@
json_prueba_2.json
json_prueba.json