Merge remote-tracking branch 'upstream/master'
authorAlicia FLOREZ <alic.florez@gmail.com>
Wed, 13 Aug 2014 10:15:43 +0000 (12:15 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Wed, 13 Aug 2014 10:15:43 +0000 (12:15 +0200)
commitbd19edc26166f0aca6e9caae70a20b7a4d9f3492
tree320b87fcfb88a702cb4095a63a4715027c59c272
parenta51ae8e62b0d48d7682866a0cedb8544c3208997
parentcf9230d1ff0bb99caa8a22d64bc3517c2445e25f
Merge remote-tracking branch 'upstream/master'