Merge master.
authorCarl Hetherington <cth@carlh.net>
Sun, 22 Jun 2014 20:48:49 +0000 (21:48 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 22 Jun 2014 20:48:49 +0000 (21:48 +0100)
commite6c67f4aac2ca9afc275b6f13058e1e46f2cecc3
treee9502ed7f81638352390b1ff114359a00da51e8d
parentf0edd6ab35c3c2b7800a26ec8206adab75e5f633
parent79a871ea740509ff2fa540ca715375e0ba1c4ad9
Merge master.
ChangeLog
src/lib/image_proxy.cc