merge

components/datepicker/demo/time.md

@@ -9,13 +9,16 @@
 ````jsx
 import { Datepicker, Timepicker } from 'antd';
 
-function onChange(value) {
-  console.log(value);
+function onDateChange(date) {
+  console.log(date);
+}
+
+function onTimeChange(time) {
+  console.log(time);
 }
 
 ReactDOM.render(<div>
-  <Datepicker onChange={onChange} />
-  <Timepicker onChange={onChange} />
+  <Datepicker onChange={onDateChange} />
+  <Timepicker onChange={onTimeChange} />
 </div>, document.getElementById('components-datepicker-demo-time'));
 ````
-

package.json

@@ -57,7 +57,7 @@
     "rc-switch": "~1.3.1",
     "rc-table": "~3.6.1",
     "rc-tabs": "~5.5.0",
-    "rc-time-picker": "~0.5.4",
+    "rc-time-picker": "~0.5.6",
     "rc-tooltip": "~3.2.0",
     "rc-tree": "~0.19.0",
     "rc-trigger": "~1.0.6",