[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=9814fca

The following commit has been merged in the master branch:
commit 9814fcabadbcdf7ace816bd22aedc8fbabb7b3c4
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Jan 13 20:28:38 2013 +0000

    Issue: #868.  Thank you Michal for the patch.
---
 src/minoltamn.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 584d064..b9ad72e 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1693,6 +1693,7 @@ namespace Exiv2 {
                  "Tamron SP AF 17-35mm F2.8-4 Di LD Aspherical IF | "
                  "Sigma AF 50-150mm F2.8 EX DC APO HSM II | "
                  "Sigma 10-20mm F3.5 EX DC HSM | "
+                 "Sigma 50mm F1.4 EX DG HSM | "
                  "Sigma 70-200mm F2.8 II EX DG APO MACRO HSM" },
         { 129,   "Tamron 200-400mm F5.6 LD | "
                  "Tamron 70-300mm F4-5.6 LD" },
@@ -1781,7 +1782,8 @@ namespace Exiv2 {
                  "Sigma 14mm F3.5 | "
                  "Sigma 15mm F2.8 Fisheye" },
         { 25790, "Minolta AF 20mm F2.8" },
-        { 25791, "Minolta/Sony AF 20mm F2.8" },
+        { 25791, "Minolta/Sony AF 20mm F2.8 | " 
+                 "Tokina AT-X 116 PRO DX AF 11-16mm F2.8" },
         { 25810, "Minolta AF 100mm F2.8 Macro" },
         { 25811, "Minolta AF 100mm F2.8 Macro [New] | "
                  "Sigma AF 90mm F2.8 Macro | "

-- 
exiv2 packaging