Merge branch 'master' of ssh://git.intermediae.es:22004//home/osp/OSP

4403e6ba · Jara Rocha · 8ec80348 · 77b83747 · 4403e6ba · 4403e6ba
Commit 4403e6ba authored Oct 16, 2012 by Jara Rocha
--- a/4cow4.txt
+++ b/4cow4.txt
+ ______________________
+< 404. No moo found... >
+ ----------------------
+        \   ^__^
+         \  (oo)\_______
+            (__)\       )\/\
+                ||----w |
+                ||     ||
--- a/iconic.zip
+++ b/iconic.zip
--- a/img/Piratepad.png
+++ b/img/Piratepad.png
--- a/img/logo.png
+++ b/img/logo.png
--- a/test
+++ b/test
 hello world!
+bye bye