[libmkv: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/libmkv

[Bernard Johnson]

commit b8fd5c06bbbb361125a9ce696485937651b8ce31
Merge: fb313c7 1d333c1
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Sun Jan 22 20:39:55 2012 -0700

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/libmkv
    
    Conflicts:
    	libmkv.spec

 libmkv.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc libmkv.spec
index 585cf0f,d64d3e6..8dcd161
--- a/libmkv.spec
+++ b/libmkv.spec
@@@ -61,8 -55,8 +61,12 @@@ development files
  %exclude %{_libdir}/libmkv.la
  
  %changelog
 +* Sun Jan 22 2012 Bernard Johnson <bjohnson at symetrix.com> - 0.6.5.1-1
 +- v 0.6.5.1
++   + Fix offset calculation for track private data
++
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
  
  * Mon Feb 21 2011 Bernard Johnson <bjohnson at symetrix.com> - 0.6.4.1-1
  - v 0.6.4.1