Merge refs/remotes/origin/patch-2 into refs/remotes/origin/patch-3
authorFrancesc Bassas i Bullich <francesc@babu.cat>
Thu, 14 Jul 2016 11:19:04 +0000 (13:19 +0200)
committerFrancesc Bassas i Bullich <francesc@babu.cat>
Thu, 14 Jul 2016 11:19:04 +0000 (13:19 +0200)
commit04b59e74e2b03b44a9999e229ca63e27cc327d83
treee6927eb4b5aef3c37228e6cdd3ee7c211fa00ec5
parent6d686296ccea43db9daf41f493918d0bff7048f7
parent96c3f0b20f0881b286b3d207cdef7a4a5f256736
Merge refs/remotes/origin/patch-2 into refs/remotes/origin/patch-3