commit f3136431df3319c415fde335f172f55f0d74494f
author Dirk Dougherty <ddougherty@google.com> Wed Jun 26 11:05:13 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 26 11:05:13 2013 -0700
tree 69f9ff7cd8b248837d9903c1d551d27b1051adfb
parent 61cf860801f1106d71124c69deebfb53ec25ac69
parent 6dcbcb7a539a7704672cc22dba3ac12cf5622b36

am 6dcbcb7a: am 90b9ab16: Merge commit \'b1637825\' into manualmerge

* commit '6dcbcb7a539a7704672cc22dba3ac12cf5622b36':
  Adjust the redirects for edu and a couple others.

scripts/app_engine_server/redirects.yaml

diff --git a/scripts/app_engine_server/redirects.yaml b/scripts/app_engine_server/redirects.yaml
index 2866c34..7cb6379 100644
--- a/scripts/app_engine_server/redirects.yaml
+++ b/scripts/app_engine_server/redirects.yaml
@@ -655,18 +655,22 @@
   dst: http://www.youtube.com/user/androiddevelopers
   type: permanent
 
-- src: /playbadge
+- src: /playbadge/?$
   dst: http://developer.android.com/distribute/googleplay/promote/badges.html
   type: permanent
 
-- src: /deviceart
+- src: /deviceart/?$
   dst: http://developer.android.com/distribute/promote/device-art.html
   type: permanent
 
+- src: /edu/signup/?$
+  dst: https://services.google.com/fb/forms/playedu
+  type: permanent
+
+- src: /edu/?$
+  dst: /distribute/googleplay/edu/index.html
+  type: permanent
+
 - src: /edu/signup
   dst: https://services.google.com/fb/forms/playedu
   type: permanent
-
-- src: /edu
-  dst: /distribute/googleplay/edu/index.html
-  type: permanent