Fix `org-time-stamp'

* lisp/org.el (org-time-stamp): Properly insert time when specified.

This fixes e50baa4cf7b97cc2e9b6991560be2bd970106e1e.

Reported-by: Rasmus <rasmus@gmx.us>
<http://permalink.gmane.org/gmane.emacs.orgmode/95210>

lisp/org.el

@@ -16484,6 +16484,8 @@ non-nil."
          (repeater (and ts
 			(string-match "\\([.+-]+[0-9]+[hdwmy] ?\\)+" ts)
 			(match-string 0 ts)))
+	 org-time-was-given
+	 org-end-time-was-given
 	 (time
 	  (and (if (equal arg '(16)) (current-time)
 		 ;; Preserve `this-command' and `last-command'.
@@ -16491,8 +16493,7 @@ non-nil."
 		       (last-command last-command))
 		   (org-read-date
 		    arg 'totime nil nil default-time default-input
-		    inactive)))))
-         org-time-was-given org-end-time-was-given)
+		    inactive))))))
     (cond
      ((and ts
            (memq last-command '(org-time-stamp org-time-stamp-inactive))