Merge branch 'hotfix/filter_bug' into dev
authorBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Thu, 11 Apr 2013 18:45:31 +0000 (14:45 -0400)
committerBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Thu, 11 Apr 2013 18:45:31 +0000 (14:45 -0400)
commit2e15d1e99a6d8e5e2cab4090978d4ef4ac6187b3
treed37aab7c15320c120817fad8358c7863807d62b0
parent815715705a7a6edfeaa18879c30b864677497541
parent6ac4e94ce38a2154e61bc5492ddb3e5fb3962b15
Merge branch 'hotfix/filter_bug' into dev