Merge branch 'master' into gh-pages

2016-04-14 14:57:27 -07:00 · 2016-04-14 14:57:27 -07:00 · aee5242bde
commit aee5242bde
parent 31e90e5347 868f7068f4
1 changed files with 2 additions and 0 deletions
--- a/devices/pc/machine/5150/cga/384kb/softkbd/machine.md
+++ b/devices/pc/machine/5150/cga/384kb/softkbd/machine.md
@ -2,6 +2,8 @@
 layout: page
 title: IBM PC (Model 5150, 384Kb) with Color Display and Soft Keyboard
 permalink: /devices/pc/machine/5150/cga/384kb/softkbd/
+redirect_from:
+  - /devices/pc/machine/5150/cga/384kb/
 machines:
  - type: pc
    id: ibm5150