Merge remote-tracking branch 'upstream/develop' into us4_view_text_files
authorJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Sat, 29 Nov 2014 20:12:51 +0000 (21:12 +0100)
committerJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Sat, 29 Nov 2014 20:12:51 +0000 (21:12 +0100)
commitd5566ce0a3c8ee8295f8c209a7d2a02f0f49faa2
treeb92392a66af68ec885363d740800c7a5cced5b3c
parent45fd60d3e52a19562016ba35a76d852cea48f558
parentb2af9efa788b773069df27bd5b82666c135305b0
Merge remote-tracking branch 'upstream/develop' into us4_view_text_files