Merge remote-tracking branch 'origin/master' into rewrite-filter
authorHeikki Levanto <heikki@indexdata.dk>
Wed, 29 May 2013 11:12:49 +0000 (13:12 +0200)
committerHeikki Levanto <heikki@indexdata.dk>
Wed, 29 May 2013 11:13:10 +0000 (13:13 +0200)
commit2c08da821832998446e5fe92acf4d1e87fe531d4
tree4885dacdc21cd9652eeb371e05b3b702c22d50ac
parent0ce322844494022dc85a9c776d9ff041aad17520
parent2397eb36b4ea68b2c1d33e119f3916972d5b661e
Merge remote-tracking branch 'origin/master' into rewrite-filter

Conflicts:
src/Makefile.am

Signed-off-by: Heikki Levanto <heikki@indexdata.dk>
src/Makefile.am
src/factory_static.cpp
src/test_filter_rewrite.cpp