Merge commit '96fecb1' (Multilib differences report)

Conflicts:
	packages/views/__init__.py
	templates/packages/differences.html

1 files changed, 4 insertions, 2 deletions

diff --git a/packages/views/__init__.py b/packages/views/__init__.py
index 7a8dabd5..573e0c72 100644
--- a/packages/views/__init__.py
+++ b/packages/views/__init__.py
@@ -16,7 +16,7 @@ from main.models import Package, PackageFile, Arch, Repo
 from mirrors.models import MirrorUrl
 from ..models import PackageRelation, PackageGroup
 from ..utils import (get_group_info, get_differences_info,
-        get_wrong_permissions)
+        multilib_differences, get_wrong_permissions)
 
 # make other views available from this same package
 from .flag import flaghelp, flag, flag_confirmed, unflag, unflag_all
@@ -233,11 +233,13 @@ def arch_differences(request):
     arch_a = Arch.objects.get(name=request.GET.get('arch_a', 'i686'))
     arch_b = Arch.objects.get(name=request.GET.get('arch_b', 'x86_64'))
     differences = get_differences_info(arch_a, arch_b)
+    multilib_diffs = multilib_differences()
     context = {
             'arch_a': arch_a,
             'arch_b': arch_b,
             'differences': differences,
-            'arches': Arch.objects.filter(agnostic=False)
+            'arches': Arch.objects.filter(agnostic=False),
+            'multilib_differences': multilib_diffs
     }
     return direct_to_template(request, 'packages/differences.html', context)