Merge branch 'master' of http://www.physics.drexel.edu/~wking/code/git/be

Conflicts:
	interfaces/web/web.py

diff --cc interfaces/web/web.py
index 2cfdd04afd0593bc0c125b9a8094ce0fb8055bfb,a99758cd174de6dc42c7cf9cf3500fb469d528ac..dcb205bc252256f4ee07d4efc756d76b9077aeef
--- 1/interfaces/web/web.py
--- 2/interfaces/web/web.py
+++ b/interfaces/web/web.py
@@@ -77,7 -78,7 +78,11 @@@ class WebInterface
                  if targetbug == None:
                      return []
                  bugs = [bug for bug in get_blocked_by(self.bd, targetbug) if
++<<<<<<< HEAD
 +                        bug.status not in ('closed', 'fixed', 'wontfix')]
++=======
+                         bug.active]
++>>>>>>> 8f1cd4f5eecba8e3322ea6725d71e430520d1585
          return bugs
      
      
@@@ -184,7 -185,13 +189,17 @@@
              bug.severity = severity if severity != 'None' else None
              
          if target:
++<<<<<<< HEAD
 +            add_target(self.bd, bug, target)
++=======
+             current_target = bug_target(self.bd, bug)
+             if current_target:
+                 remove_target(self.bd, bug)
+                 if target != "None":
+                     add_target(self.bd, bug, target)
+             else:
+                 add_target(self.bd, bug, target)
++>>>>>>> 8f1cd4f5eecba8e3322ea6725d71e430520d1585
  
          bug.save()