merged asterix_stabilization r620:1109

git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization_temporal_functionality@1113 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf12.adm b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf12.adm
new file mode 100644
index 0000000..697cb3a
--- /dev/null
+++ b/asterix-app/src/test/resources/runtimets/results/user-defined-functions/udf12.adm
@@ -0,0 +1 @@
+300