Merge branch 'master' into lucene_memory
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Thu, 5 Apr 2012 08:41:37 +0000 (10:41 +0200)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Thu, 5 Apr 2012 08:41:37 +0000 (10:41 +0200)
commit80ab7c8128a710975c5d705278f01d74de557ee7
tree979145bcc935a40749dd3178ec9cc4a0bcae3d4c
parentf2e5eb8d76c57ee0198207e68a198d2b9cfd6fec
parent76f826dc725ed971e4797cb98e1db92e61174dc1
Merge branch 'master' into lucene_memory