=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java	2013-08-22 16:03:12 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java	2013-08-23 08:07:31 +0000
@@ -94,8 +94,6 @@
     // -------------------------------------------------------------------------
 
     //TODO org unit children / descendants
-    //TODO paging
-    //TODO sorting
     
     public Grid getEvents( EventQueryParams params )
     {

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/Timer.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/Timer.java	2013-05-26 14:06:51 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/Timer.java	2013-08-23 08:07:31 +0000
@@ -1,5 +1,8 @@
 package org.hisp.dhis.system.util;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /*
  * Copyright (c) 2004-2012, University of Oslo
  * All rights reserved.
@@ -29,6 +32,8 @@
 
 public class Timer
 {
+    private static final Log log = LogFactory.getLog( Timer.class );
+    
     private long startTime;
     
     private boolean printDisabled;
@@ -58,7 +63,7 @@
         
         if ( !printDisabled )
         {
-            System.out.println( "Time: " + time + " micros: " + msg );
+            log.info( "Time: " + time + " micros: " + msg );
         }
         
         return time;