[med-svn] [SCM] aghermann branch, master, updated. 4f7a3b774136ffffbaf9b05d90bd568347bc5461

[Andrei Zavada]

The following commit has been merged in the master branch:
commit c5ea23ce35103f4a7956fdadd26169b86ee28842
Merge: 0414997b975c03c5ca7fdb888869b23ab6474697 231783485e37286b58f5ed4ff75b7b366da625c5
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Mon Oct 22 02:38:43 2012 +0300

    Merge branch 'WIP' of github.com:hmmr/aghermann into WIP
    
    Conflicts:
    	src/ui/sf-filter_cb.cc


-- 
Sleep experiment manager