Merge pull request #3654 from StevenPuttemans:add_annotation_master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 3 Mar 2015 12:53:06 +0000 (12:53 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 3 Mar 2015 12:53:07 +0000 (12:53 +0000)
commit62b8895814f19ffa478152e31abb269d9378a426
tree3cb3544387b168b6f6f6ac1e4572821f55aa7237
parent6820292256dcd8b36ff1863cfdb9368ff3e73189
parent0833352660083d2eb7fecc4e0e80f46a86f22e41
Merge pull request #3654 from StevenPuttemans:add_annotation_master